diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-01-03 06:58:46 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-09 06:30:54 +0300 |
| commit | cd900f0cacd7601dabdd028e8cbdbf2a7041cee2 (patch) | |
| tree | ee7a4e59f6dd405c03d544ec877f3f33ec3ba685 /crypto/essiv.c | |
| parent | b9f76dddb1f9f70e008b982381bbc9a67c9b8c66 (diff) | |
| download | linux-cd900f0cacd7601dabdd028e8cbdbf2a7041cee2.tar.xz | |
crypto: aead - pass instance to crypto_grab_aead()
Initializing a crypto_aead_spawn currently requires:
1. Set spawn->base.inst to point to the instance.
2. Call crypto_grab_aead().
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_aead() 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/essiv.c')
| -rw-r--r-- | crypto/essiv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/essiv.c b/crypto/essiv.c index 0e45f5b4f67f..20d7c1fdbf5d 100644 --- a/crypto/essiv.c +++ b/crypto/essiv.c @@ -500,8 +500,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb) ictx = crypto_instance_ctx(inst); /* AEAD cipher, e.g., "authenc(hmac(sha256),cbc(aes))" */ - crypto_set_aead_spawn(&ictx->u.aead_spawn, inst); - err = crypto_grab_aead(&ictx->u.aead_spawn, + err = crypto_grab_aead(&ictx->u.aead_spawn, inst, inner_cipher_name, 0, mask); if (err) goto out_free_inst; |