Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-16 14:46:35 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-16 14:46:53 +0200
commitf96c64241b45cbdecbcf2b70195392d46e1115a5 (patch)
tree85ec3aa5b0b2da691a045135fa3cc872a8c4aa3d
parent1c7364cfa51ec88ac2702dbce5e1970a87fa4395 (diff)
crypto: talitos - fix CTR alg blocksize (bsc#1051510).
-rw-r--r--patches.fixes/crypto-talitos-fix-CTR-alg-blocksize.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.fixes/crypto-talitos-fix-CTR-alg-blocksize.patch b/patches.fixes/crypto-talitos-fix-CTR-alg-blocksize.patch
new file mode 100644
index 0000000000..dd2a40ef59
--- /dev/null
+++ b/patches.fixes/crypto-talitos-fix-CTR-alg-blocksize.patch
@@ -0,0 +1,35 @@
+From b9a05b6041cb9810a291315569b2af0d63c3680a Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Tue, 21 May 2019 13:34:11 +0000
+Subject: [PATCH] crypto: talitos - fix CTR alg blocksize
+Git-commit: b9a05b6041cb9810a291315569b2af0d63c3680a
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+CTR has a blocksize of 1.
+
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Fixes: 5e75ae1b3cef ("crypto: talitos - add new crypto modes")
+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 95f71e18bf55..8b9a529f1b66 100644
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -2822,7 +2822,7 @@ static struct talitos_alg_template driver_algs[] = {
+ .alg.crypto = {
+ .cra_name = "ctr(aes)",
+ .cra_driver_name = "ctr-aes-talitos",
+- .cra_blocksize = AES_BLOCK_SIZE,
++ .cra_blocksize = 1,
+ .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+ CRYPTO_ALG_ASYNC,
+ .cra_ablkcipher = {
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 5996de7091..83dbfbc189 100644
--- a/series.conf
+++ b/series.conf
@@ -22817,6 +22817,7 @@
patches.fixes/crypto-ccp-Fix-3DES-complaint-from-ccp-crypto-module.patch
patches.fixes/crypto-talitos-rename-alternative-AEAD-algos.patch
patches.fixes/crypto-talitos-reduce-max-key-size-for-SEC1.patch
+ patches.fixes/crypto-talitos-fix-CTR-alg-blocksize.patch
patches.fixes/lib-scatterlist-Fix-mapping-iterator-when-sg-offset-.patch
patches.drivers/pwm-stm32-Use-3-cells-of_xlate.patch
patches.drivers/gpio-omap-fix-lack-of-irqstatus_raw0-for-OMAP4.patch