diff options
| author | Eric Biggers <ebiggers@google.com> | 2016-10-28 18:51:13 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-11-01 01:37:16 +0100 |
| commit | a35528eca0977482b240c29cad5e1cf10e03a6a9 (patch) | |
| tree | b1d970428b643dd9df59bc736e6efd55b7ffb9b6 /crypto/chacha20poly1305.c | |
| parent | hwrng: atmel - disable TRNG during suspend (diff) | |
| download | linux-a35528eca0977482b240c29cad5e1cf10e03a6a9.tar.xz linux-a35528eca0977482b240c29cad5e1cf10e03a6a9.zip | |
crypto: skcipher - Get rid of crypto_grab_skcipher2()
Since commit 3a01d0ee2b99 ("crypto: skcipher - Remove top-level
givcipher interface"), crypto_grab_skcipher2() and
crypto_grab_skcipher() are equivalent. So switch callers of
crypto_grab_skcipher2() to crypto_grab_skcipher() and remove it.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/chacha20poly1305.c')
| -rw-r--r-- | crypto/chacha20poly1305.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c index e899ef51dc8e..66291d4ddaab 100644 --- a/crypto/chacha20poly1305.c +++ b/crypto/chacha20poly1305.c @@ -625,9 +625,9 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, goto err_free_inst; crypto_set_skcipher_spawn(&ctx->chacha, aead_crypto_instance(inst)); - err = crypto_grab_skcipher2(&ctx->chacha, chacha_name, 0, - crypto_requires_sync(algt->type, - algt->mask)); + err = crypto_grab_skcipher(&ctx->chacha, chacha_name, 0, + crypto_requires_sync(algt->type, + algt->mask)); if (err) goto err_drop_poly; |