Skip to content

Commit

Permalink
crypto: null - Get rid of crypto_{get,put}_default_null_skcipher2()
Browse files Browse the repository at this point in the history 
Since commit 499a66e ("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 <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
@ebiggers @herbertx
ebiggers authored and herbertx committed Dec 22, 2017
1 parent cadc9ab commit 3a2d4fb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 21 deletions.
6 changes: 3 additions & 3 deletions crypto/aead.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -315,7 +315,7 @@ int aead_init_geniv(struct crypto_aead *aead)
return err;

drop_null:
crypto_put_default_null_skcipher2();
crypto_put_default_null_skcipher();
goto out;
}
EXPORT_SYMBOL_GPL(aead_init_geniv);
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions crypto/algif_aead.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ static void *aead_bind(const char *name, u32 type, u32 mask)
return ERR_CAST(aead);
}

null_tfm = crypto_get_default_null_skcipher2();
null_tfm = crypto_get_default_null_skcipher();
if (IS_ERR(null_tfm)) {
crypto_free_aead(aead);
kfree(tfm);
Expand All @@ -487,7 +487,7 @@ static void aead_release(void *private)
struct aead_tfm *tfm = private;

crypto_free_aead(tfm->aead);
crypto_put_default_null_skcipher2();
crypto_put_default_null_skcipher();
kfree(tfm);
}

Expand Down
4 changes: 2 additions & 2 deletions crypto/authenc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ static int crypto_authenc_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(enc))
goto err_free_ahash;

null = crypto_get_default_null_skcipher2();
null = crypto_get_default_null_skcipher();
err = PTR_ERR(null);
if (IS_ERR(null))
goto err_free_skcipher;
Expand Down Expand Up @@ -363,7 +363,7 @@ static void crypto_authenc_exit_tfm(struct crypto_aead *tfm)

crypto_free_ahash(ctx->auth);
crypto_free_skcipher(ctx->enc);
crypto_put_default_null_skcipher2();
crypto_put_default_null_skcipher();
}

static void crypto_authenc_free(struct aead_instance *inst)
Expand Down
4 changes: 2 additions & 2 deletions crypto/authencesn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)
if (IS_ERR(enc))
goto err_free_ahash;

null = crypto_get_default_null_skcipher2();
null = crypto_get_default_null_skcipher();
err = PTR_ERR(null);
if (IS_ERR(null))
goto err_free_skcipher;
Expand Down Expand Up @@ -389,7 +389,7 @@ static void crypto_authenc_esn_exit_tfm(struct crypto_aead *tfm)

crypto_free_ahash(ctx->auth);
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)
Expand Down
4 changes: 2 additions & 2 deletions crypto/gcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions include/crypto/null.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,4 @@
struct crypto_skcipher *crypto_get_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

0 comments on commit 3a2d4fb

Please sign in to comment.