[PATCH 5/4][SRU][Wily] [stable-only] crypto: {blk, giv}cipher: Set has_setkey
Kamal Mostafa
kamal at canonical.com
Thu Mar 24 22:49:32 UTC 2016
From: Ben Hutchings <ben at decadent.org.uk>
Commit a1383cd86a06 ("crypto: skcipher - Add crypto_skcipher_has_setkey")
was incorrectly backported to the 3.2.y and 3.16.y stable branches.
We need to set ablkcipher_tfm::has_setkey in the
crypto_init_blkcipher_ops_async() and crypto_init_givcipher_ops()
functions as well as crypto_init_ablkcipher_ops().
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Reference: http://article.gmane.org/gmane.linux.kernel.stable/169083
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
crypto/ablkcipher.c | 1 +
crypto/blkcipher.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 71b4b2e..13836be 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -459,6 +459,7 @@ static int crypto_init_givcipher_ops(struct crypto_tfm *tfm, u32 type,
crt->givdecrypt = alg->givdecrypt ?: no_givdecrypt;
crt->base = __crypto_ablkcipher_cast(tfm);
crt->ivsize = alg->ivsize;
+ crt->has_setkey = alg->max_keysize;
return 0;
}
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 8cc1622..79978da 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -472,6 +472,7 @@ static int crypto_init_blkcipher_ops_async(struct crypto_tfm *tfm)
}
crt->base = __crypto_ablkcipher_cast(tfm);
crt->ivsize = alg->ivsize;
+ crt->has_setkey = alg->max_keysize;
return 0;
}
--
2.7.0
More information about the kernel-team
mailing list