drop queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch

diff --git a/queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch b/queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
deleted file mode 100644 (file)
index 2d5ecc3..0000000
--- a/queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cantona@cantona.net  Thu Jun 11 12:53:25 2020
-From: Su Kang Yin <cantona@cantona.net>
-Date: Thu, 11 Jun 2020 18:07:45 +0800
-Subject: crypto: talitos - fix ECB and CBC algs ivsize
-To: gregkh@linuxfoundation.org, linux-crypto@vger.kernel.org, christophe.leroy@c-s.fr
-Cc: Su Kang Yin <cantona@cantona.net>, Herbert Xu <herbert@gondor.apana.org.au>, "David S. Miller" <davem@davemloft.net>, linux-kernel@vger.kernel.org
-Message-ID: <20200611100745.6513-1-cantona@cantona.net>
-
-From: Su Kang Yin <cantona@cantona.net>
-
-Patch for 4.9 upstream:
-
-commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize")
-wrongly modified CBC algs ivsize instead of ECB aggs ivsize.
-
-This restore the CBC algs original ivsize of removes ECB's ones.
-
-Signed-off-by: Su Kang Yin <cantona@cantona.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/crypto/talitos.c |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/drivers/crypto/talitos.c
-+++ b/drivers/crypto/talitos.c
-@@ -2636,7 +2636,6 @@ static struct talitos_alg_template drive
-                       .cra_ablkcipher = {
-                               .min_keysize = AES_MIN_KEY_SIZE,
-                               .max_keysize = AES_MAX_KEY_SIZE,
--                              .ivsize = AES_BLOCK_SIZE,
-                       }
-               },
-               .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
-@@ -2670,6 +2669,7 @@ static struct talitos_alg_template drive
-                       .cra_ablkcipher = {
-                               .min_keysize = AES_MIN_KEY_SIZE,
-                               .max_keysize = AES_MAX_KEY_SIZE,
-+                              .ivsize = AES_BLOCK_SIZE,
-                               .setkey = ablkcipher_aes_setkey,
-                       }
-               },
-@@ -2687,7 +2687,6 @@ static struct talitos_alg_template drive
-                       .cra_ablkcipher = {
-                               .min_keysize = DES_KEY_SIZE,
-                               .max_keysize = DES_KEY_SIZE,
--                              .ivsize = DES_BLOCK_SIZE,
-                       }
-               },
-               .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
-@@ -2720,7 +2719,6 @@ static struct talitos_alg_template drive
-                       .cra_ablkcipher = {
-                               .min_keysize = DES3_EDE_KEY_SIZE,
-                               .max_keysize = DES3_EDE_KEY_SIZE,
--                              .ivsize = DES3_EDE_BLOCK_SIZE,
-                       }
-               },
-               .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |

diff --git a/queue-4.9/series b/queue-4.9/series
index e5184cedc0f32f4e2b22c6165f62207fc29dc8e4..330bbc5a525d5066a71243127427e0380db49cf0 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,4 +1,3 @@
 ipv6-fix-ipv6_addrform-operation-logic.patch
 vxlan-avoid-infinite-loop-when-suppressing-ns-messages-with-invalid-options.patch
-crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
 scsi-return-correct-blkprep-status-code-in-case-scsi_init_io-fails.patch