diff options
author | Eric Biggers <ebiggers@google.com> | 2017-12-07 13:56:34 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-12-22 03:29:08 -0500 |
commit | 3a2d4fb51e5a96ab2a3846f9fe876750c8d14391 (patch) | |
tree | d723a67dbacf17dc07c4bf575a543019e2a0cbfa /crypto/algif_aead.c | |
parent | cadc9ab50350a24140612814109e826bb0e2ae37 (diff) |
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.c | 4 |
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) | |||
469 | return ERR_CAST(aead); | 469 | return ERR_CAST(aead); |
470 | } | 470 | } |
471 | 471 | ||
472 | null_tfm = crypto_get_default_null_skcipher2(); | 472 | null_tfm = crypto_get_default_null_skcipher(); |
473 | if (IS_ERR(null_tfm)) { | 473 | if (IS_ERR(null_tfm)) { |
474 | crypto_free_aead(aead); | 474 | crypto_free_aead(aead); |
475 | kfree(tfm); | 475 | kfree(tfm); |
@@ -487,7 +487,7 @@ static void aead_release(void *private) | |||
487 | struct aead_tfm *tfm = private; | 487 | struct aead_tfm *tfm = private; |
488 | 488 | ||
489 | crypto_free_aead(tfm->aead); | 489 | crypto_free_aead(tfm->aead); |
490 | crypto_put_default_null_skcipher2(); | 490 | crypto_put_default_null_skcipher(); |
491 | kfree(tfm); | 491 | kfree(tfm); |
492 | } | 492 | } |
493 | 493 | ||