summaryrefslogtreecommitdiffstats
path: root/crypto/authenc.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2020-01-02 19:58:45 -0800
committerHerbert Xu <herbert@gondor.apana.org.au>2020-01-09 11:30:54 +0800
commitb9f76dddb1f9f70e008b982381bbc9a67c9b8c66 (patch)
tree329d8484b8eace9777db4e9965b02372c79e1a9f /crypto/authenc.c
parent77f7e94d72208a1a84c88ed4de16a9bf368e9ded (diff)
downloadlinux-b9f76dddb1f9f70e008b982381bbc9a67c9b8c66.tar.bz2
crypto: skcipher - pass instance to crypto_grab_skcipher()
Initializing a crypto_skcipher_spawn currently requires: 1. Set spawn->base.inst to point to the instance. 2. Call crypto_grab_skcipher(). But there's no reason for these steps to be separate, and in fact this unneeded complication has caused at least one bug, the one fixed by commit 6db43410179b ("crypto: adiantum - initialize crypto_spawn::inst") So just make crypto_grab_skcipher() take the instance as an argument. To keep the function calls from getting too unwieldy due to this extra argument, also introduce a 'mask' variable into the affected places which weren't already using one. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/authenc.c')
-rw-r--r--crypto/authenc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c
index 15aaddd34171..e31bcec58564 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -373,6 +373,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
struct rtattr **tb)
{
struct crypto_attr_type *algt;
+ u32 mask;
struct aead_instance *inst;
struct hash_alg_common *auth;
struct crypto_alg *auth_base;
@@ -388,9 +389,10 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
return -EINVAL;
+ mask = crypto_requires_sync(algt->type, algt->mask);
+
auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
- CRYPTO_ALG_TYPE_AHASH_MASK |
- crypto_requires_sync(algt->type, algt->mask));
+ CRYPTO_ALG_TYPE_AHASH_MASK | mask);
if (IS_ERR(auth))
return PTR_ERR(auth);
@@ -413,10 +415,8 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
if (err)
goto err_free_inst;
- crypto_set_skcipher_spawn(&ctx->enc, aead_crypto_instance(inst));
- err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,
- crypto_requires_sync(algt->type,
- algt->mask));
+ err = crypto_grab_skcipher(&ctx->enc, aead_crypto_instance(inst),
+ enc_name, 0, mask);
if (err)
goto err_drop_auth;