target/linux/apm821xx/patches-4.14/023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch

   1 From 70c4997f34b6c6888b3ac157adec49e01d0df2d5 Mon Sep 17 00:00:00 2001
   2 From: Christian Lamparter <chunkeey@gmail.com>
   3 Date: Sat, 18 May 2019 23:28:11 +0200
   4 Subject: [PATCH 14/15] crypto: crypto4xx - fix blocksize for cfb and ofb
   5
   6 While the hardware consider them to be blockciphers, the
   7 reference implementation defines them as streamciphers.
   8
   9 Do the right thing and set the blocksize to 1. This
  10 was found by CONFIG_CRYPTO_MANAGER_EXTRA_TESTS.
  11
  12 This fixes the following issues:
  13 skcipher: blocksize for ofb-aes-ppc4xx (16) doesn't match generic impl (1)
  14 skcipher: blocksize for cfb-aes-ppc4xx (16) doesn't match generic impl (1)
  15
  16 Cc: Eric Biggers <ebiggers@kernel.org>
  17 Cc: stable@vger.kernel.org
  18 Fixes: f2a13e7cba9e ("crypto: crypto4xx - enable AES RFC3686, ECB, CFB and OFB offloads")
  19 Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  20 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  21 ---
  22  drivers/crypto/amcc/crypto4xx_core.c | 4 ++--
  23  1 file changed, 2 insertions(+), 2 deletions(-)
  24
  25 --- a/drivers/crypto/amcc/crypto4xx_core.c
  26 +++ b/drivers/crypto/amcc/crypto4xx_core.c
  27 @@ -1223,7 +1223,7 @@ static struct crypto4xx_alg_common crypt
  28                         .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
  29                         .cra_flags = CRYPTO_ALG_ASYNC |
  30                                 CRYPTO_ALG_KERN_DRIVER_ONLY,
  31 -                       .cra_blocksize = AES_BLOCK_SIZE,
  32 +                       .cra_blocksize = 1,
  33                         .cra_ctxsize = sizeof(struct crypto4xx_ctx),
  34                         .cra_module = THIS_MODULE,
  35                 },
  36 @@ -1303,7 +1303,7 @@ static struct crypto4xx_alg_common crypt
  37                         .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
  38                         .cra_flags = CRYPTO_ALG_ASYNC |
  39                                 CRYPTO_ALG_KERN_DRIVER_ONLY,
  40 -                       .cra_blocksize = AES_BLOCK_SIZE,
  41 +                       .cra_blocksize = 1,
  42                         .cra_ctxsize = sizeof(struct crypto4xx_ctx),
  43                         .cra_module = THIS_MODULE,
  44                 },