Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a2d4fb5 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

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



Since commit 499a66e6 ("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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cadc9ab5

crypto/aead.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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);
@@ -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);

crypto/algif_aead.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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);

}

crypto/authenc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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)

crypto/authencesn.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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)

crypto/gcm.c

+2 −2
Original line number Diff line number Diff line
@@ -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)