| Message ID | 20190104041625.3259-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | crypto: skcipher template simplifications and conversions | expand |
On Thu, Jan 03, 2019 at 08:16:09PM -0800, Eric Biggers wrote: > Hello, > > This series adds a function skcipher_alloc_instance_simple() that > greatly simplifies creating an skcipher_instance that uses a single > underlying block cipher. It then converts the cbc, cfb, ctr, ecb, kw, > ofb, and pcbc templates to use it. In doing so, ctr, ecb, and kw are > also converted from the deprecated "blkcipher" API to the skcipher API. > > While doing this, I also found some rather silly bugs in the cfb, ofb, > and pcbc templates... So I've included the fixes for these first, in > patches 1-4. Please consider taking these first 4 patches through > 'crypto' rather than 'cryptodev'. (But 5-16 are cleanups only, so no > rush on those.) I have decided to push all of these through cryptodev because it's not clear whether the first four bug fixes are serious enough to warrant going through straight away. If I'm wrong please let me know. > Finally, I also converted ecb(arc4) and ecb(cipher_null) to the skcipher > API, since following the template conversions these were the last > generic algorithms that were still using the "blkcipher" API. > > The overall delta is almost 500 lines removed, due to removing a lot of > boilerplate that created algorithm instances. > > Eric Biggers (16): > crypto: cfb - add missing 'chunksize' property > crypto: cfb - remove bogus memcpy() with src == dest > crypto: ofb - fix handling partial blocks and make thread-safe > crypto: pcbc - remove bogus memcpy()s with src == dest > crypto: skcipher - add helper for simple block cipher modes > crypto: cbc - convert to skcipher_alloc_instance_simple() > crypto: cfb - convert to skcipher_alloc_instance_simple() > crypto: ctr - convert to skcipher API > crypto: ecb - convert to skcipher API > crypto: keywrap - convert to skcipher API > crypto: ofb - convert to skcipher_alloc_instance_simple() > crypto: pcbc - remove ability to wrap internal ciphers > crypto: pcbc - convert to skcipher_alloc_instance_simple() > crypto: arc4 - convert to skcipher API > crypto: null - convert ecb-cipher_null to skcipher API > crypto: algapi - remove crypto_alloc_instance() > > crypto/algapi.c | 33 +---- > crypto/arc4.c | 82 ++++++------ > crypto/cbc.c | 131 ++----------------- > crypto/cfb.c | 139 +++----------------- > crypto/crypto_null.c | 57 ++++---- > crypto/ctr.c | 160 ++++++----------------- > crypto/ecb.c | 151 +++++---------------- > crypto/keywrap.c | 198 ++++++++++------------------ > crypto/ofb.c | 202 ++++++----------------------- > crypto/pcbc.c | 143 +++----------------- > crypto/skcipher.c | 131 +++++++++++++++++++ > crypto/testmgr.h | 53 +++++++- > include/crypto/algapi.h | 6 +- > include/crypto/internal/hash.h | 6 +- > include/crypto/internal/skcipher.h | 15 +++ > 15 files changed, 508 insertions(+), 999 deletions(-) All applied. Thanks.
On Fri, Jan 11, 2019 at 02:33:58PM +0800, Herbert Xu wrote: > On Thu, Jan 03, 2019 at 08:16:09PM -0800, Eric Biggers wrote: > > Hello, > > > > This series adds a function skcipher_alloc_instance_simple() that > > greatly simplifies creating an skcipher_instance that uses a single > > underlying block cipher. It then converts the cbc, cfb, ctr, ecb, kw, > > ofb, and pcbc templates to use it. In doing so, ctr, ecb, and kw are > > also converted from the deprecated "blkcipher" API to the skcipher API. > > > > While doing this, I also found some rather silly bugs in the cfb, ofb, > > and pcbc templates... So I've included the fixes for these first, in > > patches 1-4. Please consider taking these first 4 patches through > > 'crypto' rather than 'cryptodev'. (But 5-16 are cleanups only, so no > > rush on those.) > > I have decided to push all of these through cryptodev because > it's not clear whether the first four bug fixes are serious enough > to warrant going through straight away. If I'm wrong please let > me know. > I'm fine with cryptodev. - Eric