From 63ce06ed7250367b3f8c8f5a51ce1c1d35b7ca74 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 7 Mar 2016 03:40:02 +0000 Subject: [PATCH] crypto: {blk,giv}cipher: Set has_setkey 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 Signed-off-by: Luis Henriques --- crypto/ablkcipher.c | 1 + crypto/blkcipher.c | 1 + 2 files changed, 2 insertions(+) diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index 5da16526c8906..970b48e70624c 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -457,6 +457,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 7180cb2fe0264..3c551d46aa3b2 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -471,6 +471,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.47.3