diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-01-03 04:58:46 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-09 04:30:54 +0100 |
| commit | cd900f0cacd7601dabdd028e8cbdbf2a7041cee2 (patch) | |
| tree | ee7a4e59f6dd405c03d544ec877f3f33ec3ba685 /include/crypto | |
| parent | crypto: skcipher - pass instance to crypto_grab_skcipher() (diff) | |
| download | linux-cd900f0cacd7601dabdd028e8cbdbf2a7041cee2.tar.xz linux-cd900f0cacd7601dabdd028e8cbdbf2a7041cee2.zip | |
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 'include/crypto')
| -rw-r--r-- | include/crypto/internal/aead.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/crypto/internal/aead.h b/include/crypto/internal/aead.h index 374185a7567f..27b7b0224ea6 100644 --- a/include/crypto/internal/aead.h +++ b/include/crypto/internal/aead.h @@ -81,14 +81,9 @@ static inline struct aead_request *aead_request_cast( return container_of(req, struct aead_request, base); } -static inline void crypto_set_aead_spawn( - struct crypto_aead_spawn *spawn, struct crypto_instance *inst) -{ - crypto_set_spawn(&spawn->base, inst); -} - -int crypto_grab_aead(struct crypto_aead_spawn *spawn, const char *name, - u32 type, u32 mask); +int crypto_grab_aead(struct crypto_aead_spawn *spawn, + struct crypto_instance *inst, + const char *name, u32 type, u32 mask); static inline void crypto_drop_aead(struct crypto_aead_spawn *spawn) { |