summaryrefslogtreecommitdiffstats
path: root/crypto/chacha20poly1305.c
diff options
context:
space:
mode:
authorEric Biggers2016-10-28 18:52:19 +0200
committerHerbert Xu2016-11-01 01:37:17 +0100
commit60425a8bad3995ed06704f2561aace906a429358 (patch)
tree52741725c132f903a4e1b43c633a3bd84c39dc23 /crypto/chacha20poly1305.c
parentcrypto: skcipher - Get rid of crypto_grab_skcipher2() (diff)
downloadkernel-qcow2-linux-60425a8bad3995ed06704f2561aace906a429358.tar.gz
kernel-qcow2-linux-60425a8bad3995ed06704f2561aace906a429358.tar.xz
kernel-qcow2-linux-60425a8bad3995ed06704f2561aace906a429358.zip
crypto: skcipher - Get rid of crypto_spawn_skcipher2()
Since commit 3a01d0ee2b99 ("crypto: skcipher - Remove top-level givcipher interface"), crypto_spawn_skcipher2() and crypto_spawn_skcipher() are equivalent. So switch callers of crypto_spawn_skcipher2() to crypto_spawn_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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index 66291d4ddaab..db1bc3147bc4 100644
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -532,7 +532,7 @@ static int chachapoly_init(struct crypto_aead *tfm)
if (IS_ERR(poly))
return PTR_ERR(poly);
- chacha = crypto_spawn_skcipher2(&ictx->chacha);
+ chacha = crypto_spawn_skcipher(&ictx->chacha);
if (IS_ERR(chacha)) {
crypto_free_ahash(poly);
return PTR_ERR(chacha);