crypto: aead - Remove blkcipher null for IV generators

The blkcipher null object is no longer used and can now be removed.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/aead.c b/crypto/aead.c
index a5d9a83f90e4de99ea990fd381c33eb7c05207b1..3f5c5ff004abc2a8e8c6739f93cbdab9c88c37c5 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -299,11 +299,6 @@ int aead_init_geniv(struct crypto_aead *aead)
        if (IS_ERR(ctx->sknull))
                goto out;
 
-       ctx->null = crypto_get_default_null_skcipher();
-       err = PTR_ERR(ctx->null);
-       if (IS_ERR(ctx->null))
-               goto drop_sknull;
-
        child = crypto_spawn_aead(aead_instance_ctx(inst));
        err = PTR_ERR(child);
        if (IS_ERR(child))
@@ -319,8 +314,6 @@ out:
        return err;
 
 drop_null:
-       crypto_put_default_null_skcipher();
-drop_sknull:
        crypto_put_default_null_skcipher2();
        goto out;
 }
@@ -331,7 +324,6 @@ 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_skcipher();
        crypto_put_default_null_skcipher2();
 }
 EXPORT_SYMBOL_GPL(aead_exit_geniv);

diff --git a/include/crypto/internal/geniv.h b/include/crypto/internal/geniv.h
index e8447c9c14e6e64233d0d426c8f499040ac1bf6d..2bcfb931bc5bc083fc7f86ea1a8a9df5d75dc070 100644 (file)
--- a/include/crypto/internal/geniv.h
+++ b/include/crypto/internal/geniv.h
@@ -20,7 +20,6 @@
 struct aead_geniv_ctx {
        spinlock_t lock;
        struct crypto_aead *child;
-       struct crypto_blkcipher *null;
        struct crypto_skcipher *sknull;
        u8 salt[] __attribute__ ((aligned(__alignof__(u32))));
 };