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/gcm.c | |
parent | cadc9ab50350a24140612814109e826bb0e2ae37 (diff) | |
download | op-kernel-dev-3a2d4fb51e5a96ab2a3846f9fe876750c8d14391.zip op-kernel-dev-3a2d4fb51e5a96ab2a3846f9fe876750c8d14391.tar.gz |
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/gcm.c')
-rw-r--r-- | crypto/gcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index 8589681..0ad879e 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -1101,7 +1101,7 @@ static int crypto_rfc4543_init_tfm(struct crypto_aead *tfm) if (IS_ERR(aead)) return PTR_ERR(aead); - null = crypto_get_default_null_skcipher2(); + null = crypto_get_default_null_skcipher(); err = PTR_ERR(null); if (IS_ERR(null)) goto err_free_aead; @@ -1129,7 +1129,7 @@ static void crypto_rfc4543_exit_tfm(struct crypto_aead *tfm) struct crypto_rfc4543_ctx *ctx = crypto_aead_ctx(tfm); crypto_free_aead(ctx->child); - crypto_put_default_null_skcipher2(); + crypto_put_default_null_skcipher(); } static void crypto_rfc4543_free(struct aead_instance *inst) |