Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-19 14:33:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-19 14:33:02 +0200
commit06827821f71daeac41526b8dc2ba5bd623e97513 (patch)
tree609252f8ca72f057aa3c40536c54f91f23217c88
parentee65de2f844b423cf3818fcb6b6235f78d873309 (diff)
crypto: talitos - fix max key size for sha384 and sha512
(bsc#1051510).
-rw-r--r--patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch b/patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch
new file mode 100644
index 0000000000..194d4bbf1d
--- /dev/null
+++ b/patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch
@@ -0,0 +1,42 @@
+From 192125ed5ce62afba24312d8e7a0314577565b4a Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Wed, 12 Jun 2019 05:49:50 +0000
+Subject: [PATCH] crypto: talitos - fix max key size for sha384 and sha512
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 192125ed5ce62afba24312d8e7a0314577565b4a
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+Below commit came with a typo in the CONFIG_ symbol, leading
+to a permanently reduced max key size regarless of the driver
+capabilities.
+
+Reported-by: Horia Geantă <horia.geanta@nxp.com>
+Fixes: b8fbdc2bc4e7 ("crypto: talitos - reduce max key size for SEC1")
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/crypto/talitos.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
+index 32a7e747dc5f..c865f5d5eaba 100644
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -823,7 +823,7 @@ static void talitos_unregister_rng(struct device *dev)
+ * HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP
+ */
+ #define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1)
+-#ifdef CONFIG_CRYPTO_DEV_TALITOS_SEC2
++#ifdef CONFIG_CRYPTO_DEV_TALITOS2
+ #define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA512_BLOCK_SIZE)
+ #else
+ #define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA256_BLOCK_SIZE)
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b928d7309e..b67c44eff9 100644
--- a/series.conf
+++ b/series.conf
@@ -22838,6 +22838,7 @@
patches.fixes/crypto-arm64-sha2-ce-correct-digest-for-empty-data-i.patch
patches.fixes/crypto-ghash-fix-unaligned-memory-access-in-ghash_se.patch
patches.fixes/crypto-chacha20poly1305-fix-atomic-sleep-when-using-.patch
+ patches.fixes/crypto-talitos-fix-max-key-size-for-sha384-and-sha51.patch
patches.fixes/lib-scatterlist-Fix-mapping-iterator-when-sg-offset-.patch
patches.fixes/crypto-ccp-Validate-the-the-error-value-used-to-inde.patch
patches.drivers/pwm-stm32-Use-3-cells-of_xlate.patch