diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-12-07 10:56:34 -0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-12-22 19:29:08 +1100 |
| commit | 3a2d4fb51e5a96ab2a3846f9fe876750c8d14391 (patch) | |
| tree | d723a67dbacf17dc07c4bf575a543019e2a0cbfa /crypto/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/aead.c')
| -rw-r--r-- | crypto/aead.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index f794b30a9407..fe00cbd7243d 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -295,7 +295,7 @@ int aead_init_geniv(struct crypto_aead *aead) if (err) goto out; - ctx->sknull = crypto_get_default_null_skcipher2(); + ctx->sknull = crypto_get_default_null_skcipher(); err = PTR_ERR(ctx->sknull); if (IS_ERR(ctx->sknull)) goto out; @@ -315,7 +315,7 @@ out: return err; drop_null: - crypto_put_default_null_skcipher2(); + crypto_put_default_null_skcipher(); goto out; } EXPORT_SYMBOL_GPL(aead_init_geniv); @@ -325,7 +325,7 @@ void aead_exit_geniv(struct crypto_aead *tfm) struct aead_geniv_ctx *ctx = crypto_aead_ctx(tfm); crypto_free_aead(ctx->child); - crypto_put_default_null_skcipher2(); + crypto_put_default_null_skcipher(); } EXPORT_SYMBOL_GPL(aead_exit_geniv); |