mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
27dddb67c0
Refreshed all patches. Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 70c4997f34b6c6888b3ac157adec49e01d0df2d5 Mon Sep 17 00:00:00 2001
|
|
From: Christian Lamparter <chunkeey@gmail.com>
|
|
Date: Sat, 18 May 2019 23:28:11 +0200
|
|
Subject: [PATCH 14/15] crypto: crypto4xx - fix blocksize for cfb and ofb
|
|
|
|
While the hardware consider them to be blockciphers, the
|
|
reference implementation defines them as streamciphers.
|
|
|
|
Do the right thing and set the blocksize to 1. This
|
|
was found by CONFIG_CRYPTO_MANAGER_EXTRA_TESTS.
|
|
|
|
This fixes the following issues:
|
|
skcipher: blocksize for ofb-aes-ppc4xx (16) doesn't match generic impl (1)
|
|
skcipher: blocksize for cfb-aes-ppc4xx (16) doesn't match generic impl (1)
|
|
|
|
Cc: Eric Biggers <ebiggers@kernel.org>
|
|
Cc: stable@vger.kernel.org
|
|
Fixes: f2a13e7cba9e ("crypto: crypto4xx - enable AES RFC3686, ECB, CFB and OFB offloads")
|
|
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_core.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.c
|
|
@@ -1223,7 +1223,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
.cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
- .cra_blocksize = AES_BLOCK_SIZE,
|
|
+ .cra_blocksize = 1,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|
|
.cra_module = THIS_MODULE,
|
|
},
|
|
@@ -1303,7 +1303,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
.cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
- .cra_blocksize = AES_BLOCK_SIZE,
|
|
+ .cra_blocksize = 1,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|
|
.cra_module = THIS_MODULE,
|
|
},
|