From: Greg Kroah-Hartman Date: Wed, 14 Feb 2018 19:44:39 +0000 (+0100) Subject: drop 4.4 broken patch X-Git-Tag: v4.15.4~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=637e812102376813f68c75e30f9e6ced44f16367;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.4 broken patch --- diff --git a/queue-4.4/crypto-mcryptd-pass-through-absence-of-setkey.patch b/queue-4.4/crypto-mcryptd-pass-through-absence-of-setkey.patch deleted file mode 100644 index 12fa30ef9ae..00000000000 --- a/queue-4.4/crypto-mcryptd-pass-through-absence-of-setkey.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fa59b92d299f2787e6bae1ff078ee0982e80211f Mon Sep 17 00:00:00 2001 -From: Eric Biggers -Date: Wed, 3 Jan 2018 11:16:24 -0800 -Subject: crypto: mcryptd - pass through absence of ->setkey() - -From: Eric Biggers - -commit fa59b92d299f2787e6bae1ff078ee0982e80211f upstream. - -When the mcryptd template is used to wrap an unkeyed hash algorithm, -don't install a ->setkey() method to the mcryptd instance. This change -is necessary for mcryptd to keep working with unkeyed hash algorithms -once we start enforcing that ->setkey() is called when present. - -Signed-off-by: Eric Biggers -Signed-off-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman - ---- - crypto/mcryptd.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/crypto/mcryptd.c -+++ b/crypto/mcryptd.c -@@ -540,7 +540,8 @@ static int mcryptd_create_hash(struct cr - inst->alg.finup = mcryptd_hash_finup_enqueue; - inst->alg.export = mcryptd_hash_export; - inst->alg.import = mcryptd_hash_import; -- inst->alg.setkey = mcryptd_hash_setkey; -+ if (crypto_hash_alg_has_setkey(halg)) -+ inst->alg.setkey = mcryptd_hash_setkey; - inst->alg.digest = mcryptd_hash_digest_enqueue; - - err = ahash_register_instance(tmpl, inst); diff --git a/queue-4.4/series b/queue-4.4/series index 9c5726c667d..264f5e9397e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -66,5 +66,4 @@ ahci-add-pci-ids-for-intel-bay-trail-cherry-trail-and-apollo-lake-ahci.patch ahci-add-intel-cannon-lake-pch-h-pci-id.patch crypto-hash-introduce-crypto_hash_alg_has_setkey.patch crypto-cryptd-pass-through-absence-of-setkey.patch -crypto-mcryptd-pass-through-absence-of-setkey.patch crypto-poly1305-remove-setkey-method.patch