mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
f80272dd9c
Refreshed all patches. Remove upstreamed: - 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
From bfa2ba7d9e6b20aca82b99e6842fe18842ae3a0f Mon Sep 17 00:00:00 2001
|
|
From: Christian Lamparter <chunkeey@gmail.com>
|
|
Date: Fri, 17 May 2019 23:15:57 +0200
|
|
Subject: [PATCH 13/15] crypto: crypto4xx - fix AES CTR blocksize value
|
|
|
|
This patch fixes a issue with crypto4xx's ctr(aes) that was
|
|
discovered by libcapi's kcapi-enc-test.sh test.
|
|
|
|
The some of the ctr(aes) encryptions test were failing on the
|
|
non-power-of-two test:
|
|
|
|
kcapi-enc - Error: encryption failed with error 0
|
|
kcapi-enc - Error: decryption failed with error 0
|
|
[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits):
|
|
original file (1d100e..cc96184c) and generated file (e3b0c442..1b7852b855)
|
|
[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits)
|
|
(openssl generated CT): original file (e3b0..5) and generated file (3..8e)
|
|
[PASSED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits)
|
|
(openssl generated PT)
|
|
[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (password):
|
|
original file (1d1..84c) and generated file (e3b..852b855)
|
|
|
|
But the 16, 32, 512, 65536 tests always worked.
|
|
|
|
Thankfully, this isn't a hidden hardware problem like previously,
|
|
instead this turned out to be a copy and paste issue.
|
|
|
|
With this patch, all the tests are passing with and
|
|
kcapi-enc-test.sh gives crypto4xx's a clean bill of health:
|
|
"Number of failures: 0" :).
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Fixes: 98e87e3d933b ("crypto: crypto4xx - add aes-ctr support")
|
|
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
|
|
@@ -1244,7 +1244,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_flags = CRYPTO_ALG_NEED_FALLBACK |
|
|
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,
|
|
},
|
|
@@ -1264,7 +1264,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,
|
|
},
|