diff options
| author |   Eric Biggers <ebiggers@google.com> | 2020-01-02 19:58:47 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-09 11:30:54 +0800 |
| commit | 73bed26f73a120f14cabf8d214ec5078bb42dea9 (patch) | |
| tree | c82fd171ae8bb7698531c82b0f4e8970866e4820 /include/crypto | |
| parent | crypto: aead - pass instance to crypto_grab_aead() (diff) | |
| download | linux-dev-73bed26f73a120f14cabf8d214ec5078bb42dea9.tar.xz linux-dev-73bed26f73a120f14cabf8d214ec5078bb42dea9.zip | |
crypto: akcipher - pass instance to crypto_grab_akcipher()
Initializing a crypto_akcipher_spawn currently requires:
1. Set spawn->base.inst to point to the instance.
2. Call crypto_grab_akcipher().
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_akcipher() take the instance as an argument.
To keep the function call from getting too unwieldy due to this extra
argument, also introduce a 'mask' variable into pkcs1pad_create().
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/akcipher.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/crypto/internal/akcipher.h b/include/crypto/internal/akcipher.h index d6c8a42789ad..8d3220c9ab77 100644 --- a/include/crypto/internal/akcipher.h +++ b/include/crypto/internal/akcipher.h @@ -78,15 +78,9 @@ static inline void *akcipher_instance_ctx(struct akcipher_instance *inst) return crypto_instance_ctx(akcipher_crypto_instance(inst)); } -static inline void crypto_set_akcipher_spawn( - struct crypto_akcipher_spawn *spawn, - struct crypto_instance *inst) -{ - crypto_set_spawn(&spawn->base, inst); -} - -int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn, const char *name, - u32 type, u32 mask); +int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn, + struct crypto_instance *inst, + const char *name, u32 type, u32 mask); static inline struct crypto_akcipher *crypto_spawn_akcipher( struct crypto_akcipher_spawn *spawn) |