Skip to content

crypto: skcipher template simplifications and conversions

Eric Biggers linux-crypto stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest16 patches 9 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16crypto: cfb - add missing 'chunksize' propertycrypto/cfb.c crypto/testmgr.h+31 -02 replies
2/16crypto: cfb - remove bogus memcpy() with src == destcrypto/cfb.c+4 -40 replies
3/16crypto: ofb - fix handling partial blocks and make thread-safecrypto/ofb.c crypto/testmgr.h+63 -561 reply
4/16crypto: pcbc - remove bogus memcpy()s with src == destcrypto/pcbc.c+4 -101 reply
5/16crypto: skcipher - add helper for simple block cipher modescrypto/skcipher.c include/crypto/internal/skcipher.h+146 -02 replies
6/16crypto: cbc - convert to skcipher_alloc_instance_simple()crypto/cbc.c+13 -1180 replies
7/16crypto: cfb - convert to skcipher_alloc_instance_simple()crypto/cfb.c+9 -1180 replies
8/16crypto: ctr - convert to skcipher APIcrypto/ctr.c+41 -1190 replies
9/16crypto: ecb - convert to skcipher APIcrypto/ecb.c+36 -1150 replies
10/16crypto: keywrap - convert to skcipher APIcrypto/keywrap.c+65 -1331 reply
11/16crypto: ofb - convert to skcipher_alloc_instance_simple()crypto/ofb.c+7 -1120 replies
12/16crypto: pcbc - remove ability to wrap internal cipherscrypto/pcbc.c+3 -70 replies
13/16crypto: pcbc - convert to skcipher_alloc_instance_simple()crypto/pcbc.c+11 -1140 replies
14/16crypto: arc4 - convert to skcipher APIcrypto/arc4.c+44 -380 replies
15/16crypto: null - convert ecb-cipher_null to skcipher APIcrypto/crypto_null.c+32 -250 replies
16/16crypto: algapi - remove crypto_alloc_instance()crypto/algapi.c include/crypto/algapi.h include/crypto/internal/hash.h+7 -380 replies

Reviews trailers per patch

3 of 16 patches have a Reviewed-by or Acked-by.

PatchStephan MuellerGilad Ben-Yossef
1/16
2/16
3/16R-b
4/16
5/16R-b
6/16
7/16
8/16
9/16
10/16R-b
11/16
12/16
13/16
14/16
15/16
16/16

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/16] crypto: skcipher template simplifications and conversions

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.)

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(-)
Signature · 1 line
2.20.1