summaryrefslogtreecommitdiffstats
path: root/crypto/ctr.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2016-10-28 12:51:13 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2016-10-31 20:37:16 -0400
commita35528eca0977482b240c29cad5e1cf10e03a6a9 (patch)
treeb1d970428b643dd9df59bc736e6efd55b7ffb9b6 /crypto/ctr.c
parenta1fa98d8116fb4f8a5df91fb2267ce8d192f6875 (diff)
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/ctr.c')
-rw-r--r--crypto/ctr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ctr.c b/crypto/ctr.c
index ff4d21eddb83..57114b131db6 100644
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -370,9 +370,9 @@ static int crypto_rfc3686_create(struct crypto_template *tmpl,
370 spawn = skcipher_instance_ctx(inst); 370 spawn = skcipher_instance_ctx(inst);
371 371
372 crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst)); 372 crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst));
373 err = crypto_grab_skcipher2(spawn, cipher_name, 0, 373 err = crypto_grab_skcipher(spawn, cipher_name, 0,
374 crypto_requires_sync(algt->type, 374 crypto_requires_sync(algt->type,
375 algt->mask)); 375 algt->mask));
376 if (err) 376 if (err)
377 goto err_free_inst; 377 goto err_free_inst;
378 378