diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-01-03 04:58:45 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-09 04:30:54 +0100 |
| commit | b9f76dddb1f9f70e008b982381bbc9a67c9b8c66 (patch) | |
| tree | 329d8484b8eace9777db4e9965b02372c79e1a9f /include | |
| parent | crypto: ahash - make struct ahash_instance be the full size (diff) | |
| download | linux-b9f76dddb1f9f70e008b982381bbc9a67c9b8c66.tar.xz linux-b9f76dddb1f9f70e008b982381bbc9a67c9b8c66.zip | |
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 'include')
| -rw-r--r-- | include/crypto/internal/skcipher.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h index df4fdeaa13f3..e387424f6247 100644 --- a/include/crypto/internal/skcipher.h +++ b/include/crypto/internal/skcipher.h @@ -88,14 +88,9 @@ static inline void skcipher_request_complete(struct skcipher_request *req, int e req->base.complete(&req->base, err); } -static inline void crypto_set_skcipher_spawn( - struct crypto_skcipher_spawn *spawn, struct crypto_instance *inst) -{ - crypto_set_spawn(&spawn->base, inst); -} - -int crypto_grab_skcipher(struct crypto_skcipher_spawn *spawn, const char *name, - u32 type, u32 mask); +int crypto_grab_skcipher(struct crypto_skcipher_spawn *spawn, + struct crypto_instance *inst, + const char *name, u32 type, u32 mask); static inline void crypto_drop_skcipher(struct crypto_skcipher_spawn *spawn) { |