summaryrefslogtreecommitdiffstats
path: root/crypto/algif_aead.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-12-07 10:56:34 -0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-12-22 19:29:08 +1100
commit3a2d4fb51e5a96ab2a3846f9fe876750c8d14391 (patch)
treed723a67dbacf17dc07c4bf575a543019e2a0cbfa /crypto/algif_aead.c
parentcadc9ab50350a24140612814109e826bb0e2ae37 (diff)
downloadlinux-3a2d4fb51e5a96ab2a3846f9fe876750c8d14391.tar.bz2
crypto: null - Get rid of crypto_{get,put}_default_null_skcipher2()
Since commit 499a66e6b689 ("crypto: null - Remove default null blkcipher"), crypto_get_default_null_skcipher2() and crypto_put_default_null_skcipher2() are the same as their non-2 equivalents. So switch callers of the "2" versions over to the original versions and remove the "2" versions. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/algif_aead.c')
-rw-r--r--crypto/algif_aead.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 9d73be28cf01..87a27eb19680 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -469,7 +469,7 @@ static void *aead_bind(const char *name, u32 type, u32 mask)
return ERR_CAST(aead);
}
- null_tfm = crypto_get_default_null_skcipher2();
+ null_tfm = crypto_get_default_null_skcipher();
if (IS_ERR(null_tfm)) {
crypto_free_aead(aead);
kfree(tfm);
@@ -487,7 +487,7 @@ static void aead_release(void *private)
struct aead_tfm *tfm = private;
crypto_free_aead(tfm->aead);
- crypto_put_default_null_skcipher2();
+ crypto_put_default_null_skcipher();
kfree(tfm);
}