diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-12-27 12:53:44 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-12-27 12:53:44 -0700 |
| commit | 1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c (patch) | |
| tree | 3f9b77b397ec915c0eb026a9b6425e82fa843e67 /crypto/chacha20poly1305.c | |
| parent | 239a79b2f922a0614334cef0aab2f8a23a4e54f9 (diff) | |
| parent | 46cc85f2e4aef88c237a0407cf5d163619a4d565 (diff) | |
| download | linux-crypto-1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c.tar.gz linux-crypto-1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c.zip | |
Merge tag 'v4.10-rc1' into docs-next
Linux 4.10-rc1
Diffstat (limited to 'crypto/chacha20poly1305.c')
| -rw-r--r-- | crypto/chacha20poly1305.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c index e899ef51..db1bc314 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); @@ -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; |