diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-12 07:17:46 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-18 11:35:43 +0200 |
| commit | da721302a78807e5da2902677fbe116fe052068f (patch) | |
| tree | 63fc57ef2e9c3466558c165a2d1289b5e7632b17 | |
| parent | crypto: seqiv - Use skcipher (diff) | |
| download | linux-da721302a78807e5da2902677fbe116fe052068f.tar.xz linux-da721302a78807e5da2902677fbe116fe052068f.zip | |
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>
| -rw-r--r-- | crypto/aead.c | 8 | ||||
| -rw-r--r-- | include/crypto/internal/geniv.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index a5d9a83f90e4..3f5c5ff004ab 100644 --- 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 e8447c9c14e6..2bcfb931bc5b 100644 --- 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)))); }; |