4.14-stable patches

added patches:
	crypto-talitos-rename-alternative-aead-algos.patch

diff --git a/queue-4.14/crypto-talitos-rename-alternative-aead-algos.patch b/queue-4.14/crypto-talitos-rename-alternative-aead-algos.patch
new file mode 100644 (file)
index 0000000..9fcab65
--- /dev/null
+++ b/queue-4.14/crypto-talitos-rename-alternative-aead-algos.patch
@@ -0,0 +1,98 @@
+From a1a42f84011fae6ff08441a91aefeb7febc984fc Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Tue, 21 May 2019 13:34:08 +0000
+Subject: crypto: talitos - rename alternative AEAD algos.
+
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+
+commit a1a42f84011fae6ff08441a91aefeb7febc984fc upstream.
+
+The talitos driver has two ways to perform AEAD depending on the
+HW capability. Some HW support both. It is needed to give them
+different names to distingish which one it is for instance when
+a test fails.
+
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Fixes: 7405c8d7ff97 ("crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU")
+Cc: stable@vger.kernel.org
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/crypto/talitos.c |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -2185,7 +2185,7 @@ static struct talitos_alg_template drive
+                       .base = {
+                               .cra_name = "authenc(hmac(sha1),cbc(aes))",
+                               .cra_driver_name = "authenc-hmac-sha1-"
+-                                                 "cbc-aes-talitos",
++                                                 "cbc-aes-talitos-hsna",
+                               .cra_blocksize = AES_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2229,7 +2229,7 @@ static struct talitos_alg_template drive
+                               .cra_name = "authenc(hmac(sha1),"
+                                           "cbc(des3_ede))",
+                               .cra_driver_name = "authenc-hmac-sha1-"
+-                                                 "cbc-3des-talitos",
++                                                 "cbc-3des-talitos-hsna",
+                               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2271,7 +2271,7 @@ static struct talitos_alg_template drive
+                       .base = {
+                               .cra_name = "authenc(hmac(sha224),cbc(aes))",
+                               .cra_driver_name = "authenc-hmac-sha224-"
+-                                                 "cbc-aes-talitos",
++                                                 "cbc-aes-talitos-hsna",
+                               .cra_blocksize = AES_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2315,7 +2315,7 @@ static struct talitos_alg_template drive
+                               .cra_name = "authenc(hmac(sha224),"
+                                           "cbc(des3_ede))",
+                               .cra_driver_name = "authenc-hmac-sha224-"
+-                                                 "cbc-3des-talitos",
++                                                 "cbc-3des-talitos-hsna",
+                               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2357,7 +2357,7 @@ static struct talitos_alg_template drive
+                       .base = {
+                               .cra_name = "authenc(hmac(sha256),cbc(aes))",
+                               .cra_driver_name = "authenc-hmac-sha256-"
+-                                                 "cbc-aes-talitos",
++                                                 "cbc-aes-talitos-hsna",
+                               .cra_blocksize = AES_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2401,7 +2401,7 @@ static struct talitos_alg_template drive
+                               .cra_name = "authenc(hmac(sha256),"
+                                           "cbc(des3_ede))",
+                               .cra_driver_name = "authenc-hmac-sha256-"
+-                                                 "cbc-3des-talitos",
++                                                 "cbc-3des-talitos-hsna",
+                               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2527,7 +2527,7 @@ static struct talitos_alg_template drive
+                       .base = {
+                               .cra_name = "authenc(hmac(md5),cbc(aes))",
+                               .cra_driver_name = "authenc-hmac-md5-"
+-                                                 "cbc-aes-talitos",
++                                                 "cbc-aes-talitos-hsna",
+                               .cra_blocksize = AES_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },
+@@ -2569,7 +2569,7 @@ static struct talitos_alg_template drive
+                       .base = {
+                               .cra_name = "authenc(hmac(md5),cbc(des3_ede))",
+                               .cra_driver_name = "authenc-hmac-md5-"
+-                                                 "cbc-3des-talitos",
++                                                 "cbc-3des-talitos-hsna",
+                               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+                               .cra_flags = CRYPTO_ALG_ASYNC,
+                       },