From 5e7c4c084b783b5201f9350ae375956237f579fd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 10 Jul 2019 17:58:48 +0200 Subject: [PATCH] 4.9-stable patches added patches: crypto-talitos-rename-alternative-aead-algos.patch --- queue-4.14/series | 1 + queue-4.19/series | 2 + queue-4.4/series | 0 ...alitos-rename-alternative-aead-algos.patch | 98 +++++++++++++++++++ queue-4.9/series | 1 + queue-5.1/series | 3 + queue-5.2/series | 3 + 7 files changed, 108 insertions(+) create mode 100644 queue-4.14/series create mode 100644 queue-4.19/series create mode 100644 queue-4.4/series create mode 100644 queue-4.9/crypto-talitos-rename-alternative-aead-algos.patch create mode 100644 queue-4.9/series create mode 100644 queue-5.1/series create mode 100644 queue-5.2/series diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..07977fed2ef --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1 @@ +crypto-talitos-rename-alternative-aead-algos.patch diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..b2f09e23041 --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1,2 @@ +crypto-talitos-fix-hash-on-sec1.patch +crypto-talitos-rename-alternative-aead-algos.patch diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..e69de29bb2d diff --git a/queue-4.9/crypto-talitos-rename-alternative-aead-algos.patch b/queue-4.9/crypto-talitos-rename-alternative-aead-algos.patch new file mode 100644 index 00000000000..9fcab65fd13 --- /dev/null +++ b/queue-4.9/crypto-talitos-rename-alternative-aead-algos.patch @@ -0,0 +1,98 @@ +From a1a42f84011fae6ff08441a91aefeb7febc984fc Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Tue, 21 May 2019 13:34:08 +0000 +Subject: crypto: talitos - rename alternative AEAD algos. + +From: Christophe Leroy + +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 +Fixes: 7405c8d7ff97 ("crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU") +Cc: stable@vger.kernel.org +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + 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, + }, diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..07977fed2ef --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1 @@ +crypto-talitos-rename-alternative-aead-algos.patch diff --git a/queue-5.1/series b/queue-5.1/series new file mode 100644 index 00000000000..acdc05d8cda --- /dev/null +++ b/queue-5.1/series @@ -0,0 +1,3 @@ +crypto-talitos-fix-hash-on-sec1.patch +crypto-lrw-use-correct-alignmask.patch +crypto-talitos-rename-alternative-aead-algos.patch diff --git a/queue-5.2/series b/queue-5.2/series new file mode 100644 index 00000000000..acdc05d8cda --- /dev/null +++ b/queue-5.2/series @@ -0,0 +1,3 @@ +crypto-talitos-fix-hash-on-sec1.patch +crypto-lrw-use-correct-alignmask.patch +crypto-talitos-rename-alternative-aead-algos.patch -- 2.47.3