Commit 1ad0f160 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: drop mask=CRYPTO_ALG_ASYNC from 'cipher' tfm allocations 



'cipher' algorithms (single block ciphers) are always synchronous, so
passing CRYPTO_ALG_ASYNC in the mask to crypto_alloc_cipher() has no
effect.  Many users therefore already don't pass it, but some still do.
This inconsistency can cause confusion, especially since the way the
'mask' argument works is somewhat counterintuitive.

Thus, just remove the unneeded CRYPTO_ALG_ASYNC flags.

This patch shouldn't change any actual behavior.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d4165590

arch/s390/crypto/aes_s390.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int fallback_init_cip(struct crypto_tfm *tfm) 
	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);



	sctx->fallback.cip = crypto_alloc_cipher(name, 0,

			CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK);

						 CRYPTO_ALG_NEED_FALLBACK);



	if (IS_ERR(sctx->fallback.cip)) {

		pr_err("Allocating AES fallback algorithm %s failed\n",

drivers/crypto/amcc/crypto4xx_alg.c

+1 −2
Original line number Diff line number Diff line
@@ -520,8 +520,7 @@ static int crypto4xx_compute_gcm_hash_key_sw(__le32 *hash_start, const u8 *key, 
	uint8_t src[16] = { 0 };

	int rc = 0;



	aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC |

				      CRYPTO_ALG_NEED_FALLBACK);

	aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_NEED_FALLBACK);

	if (IS_ERR(aes_tfm)) {

		rc = PTR_ERR(aes_tfm);

		pr_warn("could not load aes cipher driver: %d\n", rc);

drivers/crypto/ccp/ccp-crypto-aes-cmac.c

+1 −3
Original line number Diff line number Diff line
@@ -346,9 +346,7 @@ static int ccp_aes_cmac_cra_init(struct crypto_tfm *tfm) 


	crypto_ahash_set_reqsize(ahash, sizeof(struct ccp_aes_cmac_req_ctx));



	cipher_tfm = crypto_alloc_cipher("aes", 0,

					 CRYPTO_ALG_ASYNC |

					 CRYPTO_ALG_NEED_FALLBACK);

	cipher_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_NEED_FALLBACK);

	if (IS_ERR(cipher_tfm)) {

		pr_warn("could not load aes cipher driver\n");

		return PTR_ERR(cipher_tfm);

drivers/crypto/geode-aes.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int fallback_init_cip(struct crypto_tfm *tfm) 
	struct geode_aes_op *op = crypto_tfm_ctx(tfm);



	op->fallback.cip = crypto_alloc_cipher(name, 0,

				CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK);

					       CRYPTO_ALG_NEED_FALLBACK);



	if (IS_ERR(op->fallback.cip)) {

		printk(KERN_ERR "Error allocating fallback algo %s\n", name);

drivers/md/dm-crypt.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static struct crypto_cipher *alloc_essiv_cipher(struct crypt_config *cc, 
	int err;



	/* Setup the essiv_tfm with the given salt */

	essiv_tfm = crypto_alloc_cipher(cc->cipher, 0, CRYPTO_ALG_ASYNC);

	essiv_tfm = crypto_alloc_cipher(cc->cipher, 0, 0);

	if (IS_ERR(essiv_tfm)) {

		ti->error = "Error allocating crypto tfm for ESSIV";

		return essiv_tfm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE