Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: null - Get rid of crypto_{get,put}_default_null_skcipher2()

Browse source 
Since commit 499a66e6b6 ("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>
This commit is contained in:
Eric Biggers 2017-12-07 10:56:34 -08:00 committed by Herbert Xu
parent cadc9ab503
commit 3a2d4fb51e
6 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/aead.c
View file

@ -295,7 +295,7 @@ int aead_init_geniv(struct crypto_aead *aead)
if (err) if (err)
goto out; goto out;
ctx->sknull = crypto_get_default_null_skcipher2(); ctx->sknull = crypto_get_default_null_skcipher();
err = PTR_ERR(ctx->sknull); err = PTR_ERR(ctx->sknull);
if (IS_ERR(ctx->sknull)) if (IS_ERR(ctx->sknull))
goto out; goto out;
@ -315,7 +315,7 @@ int aead_init_geniv(struct crypto_aead *aead)
return err; return err;
drop_null: drop_null:
crypto_put_default_null_skcipher2(); crypto_put_default_null_skcipher();
goto out; goto out;
} }
EXPORT_SYMBOL_GPL(aead_init_geniv); 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); struct aead_geniv_ctx *ctx = crypto_aead_ctx(tfm);
crypto_free_aead(ctx->child); crypto_free_aead(ctx->child);
crypto_put_default_null_skcipher2(); crypto_put_default_null_skcipher();
} }
EXPORT_SYMBOL_GPL(aead_exit_geniv); EXPORT_SYMBOL_GPL(aead_exit_geniv);

4
crypto/algif_aead.c
View file

@ -469,7 +469,7 @@ static void *aead_bind(const char *name, u32 type, u32 mask)
return ERR_CAST(aead); return ERR_CAST(aead);
} }
null_tfm = crypto_get_default_null_skcipher2(); null_tfm = crypto_get_default_null_skcipher();
if (IS_ERR(null_tfm)) { if (IS_ERR(null_tfm)) {
crypto_free_aead(aead); crypto_free_aead(aead);
kfree(tfm); kfree(tfm);
@ -487,7 +487,7 @@ static void aead_release(void *private)
struct aead_tfm *tfm = private; struct aead_tfm *tfm = private;
crypto_free_aead(tfm->aead); crypto_free_aead(tfm->aead);
crypto_put_default_null_skcipher2(); crypto_put_default_null_skcipher();
kfree(tfm); kfree(tfm);
} }

4
crypto/authenc.c
View file

@ -329,7 +329,7 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(enc)) if (IS_ERR(enc))
goto err_free_ahash; goto err_free_ahash;
null = crypto_get_default_null_skcipher2(); null = crypto_get_default_null_skcipher();
err = PTR_ERR(null); err = PTR_ERR(null);
if (IS_ERR(null)) if (IS_ERR(null))
goto err_free_skcipher; goto err_free_skcipher;
@ -363,7 +363,7 @@ static void crypto_authenc_exit_tfm(struct crypto_aead *tfm)
crypto_free_ahash(ctx->auth); crypto_free_ahash(ctx->auth);
crypto_free_skcipher(ctx->enc); crypto_free_skcipher(ctx->enc);
crypto_put_default_null_skcipher2(); crypto_put_default_null_skcipher();
} }
static void crypto_authenc_free(struct aead_instance *inst) static void crypto_authenc_free(struct aead_instance *inst)

4
crypto/authencesn.c
View file

@ -352,7 +352,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(enc)) if (IS_ERR(enc))
goto err_free_ahash; goto err_free_ahash;
null = crypto_get_default_null_skcipher2(); null = crypto_get_default_null_skcipher();
err = PTR_ERR(null); err = PTR_ERR(null);
if (IS_ERR(null)) if (IS_ERR(null))
goto err_free_skcipher; goto err_free_skcipher;
@ -389,7 +389,7 @@ static void crypto_authenc_esn_exit_tfm(struct crypto_aead *tfm)
crypto_free_ahash(ctx->auth); crypto_free_ahash(ctx->auth);
crypto_free_skcipher(ctx->enc); crypto_free_skcipher(ctx->enc);
crypto_put_default_null_skcipher2(); crypto_put_default_null_skcipher();
} }
static void crypto_authenc_esn_free(struct aead_instance *inst) static void crypto_authenc_esn_free(struct aead_instance *inst)

4
crypto/gcm.c
View file

@ -1101,7 +1101,7 @@ static int crypto_rfc4543_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(aead)) if (IS_ERR(aead))
return PTR_ERR(aead); return PTR_ERR(aead);
null = crypto_get_default_null_skcipher2(); null = crypto_get_default_null_skcipher();
err = PTR_ERR(null); err = PTR_ERR(null);
if (IS_ERR(null)) if (IS_ERR(null))
goto err_free_aead; 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); struct crypto_rfc4543_ctx *ctx = crypto_aead_ctx(tfm);
crypto_free_aead(ctx->child); crypto_free_aead(ctx->child);
crypto_put_default_null_skcipher2(); crypto_put_default_null_skcipher();
} }
static void crypto_rfc4543_free(struct aead_instance *inst) static void crypto_rfc4543_free(struct aead_instance *inst)

10
include/crypto/null.h
View file

@ -12,14 +12,4 @@
struct crypto_skcipher *crypto_get_default_null_skcipher(void); struct crypto_skcipher *crypto_get_default_null_skcipher(void);
void crypto_put_default_null_skcipher(void); void crypto_put_default_null_skcipher(void);
static inline struct crypto_skcipher *crypto_get_default_null_skcipher2(void)
{
return crypto_get_default_null_skcipher();
}
static inline void crypto_put_default_null_skcipher2(void)
{
crypto_put_default_null_skcipher();
}
#endif #endif