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

Commit 85d7311f authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: remove redundant type flags from tfm allocation 



Some crypto API users allocating a tfm with crypto_alloc_$FOO() are also
specifying the type flags for $FOO, e.g. crypto_alloc_shash() with
CRYPTO_ALG_TYPE_SHASH.  But, that's redundant since the crypto API will
override any specified type flag/mask with the correct ones.

So, remove the unneeded 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 2c95e6d9

Documentation/crypto/api-samples.rst

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ Code Example For Use of Operational State Memory With SHASH 
        char *hash_alg_name = "sha1-padlock-nano";

        int ret;



        alg = crypto_alloc_shash(hash_alg_name, CRYPTO_ALG_TYPE_SHASH, 0);

        alg = crypto_alloc_shash(hash_alg_name, 0, 0);

        if (IS_ERR(alg)) {

                pr_info("can't alloc alg %s\n", hash_alg_name);

                return PTR_ERR(alg);

drivers/crypto/atmel-sha.c

+1 −3
Original line number Diff line number Diff line
@@ -2316,9 +2316,7 @@ struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn(unsigned long mode) 
		goto error;

	}



	tfm = crypto_alloc_ahash(name,

				 CRYPTO_ALG_TYPE_AHASH,

				 CRYPTO_ALG_TYPE_AHASH_MASK);

	tfm = crypto_alloc_ahash(name, 0, 0);

	if (IS_ERR(tfm)) {

		err = PTR_ERR(tfm);

		goto error;

drivers/crypto/inside-secure/safexcel_hash.c

+1 −2
Original line number Diff line number Diff line
@@ -941,8 +941,7 @@ int safexcel_hmac_setkey(const char *alg, const u8 *key, unsigned int keylen, 
	u8 *ipad, *opad;

	int ret;



	tfm = crypto_alloc_ahash(alg, CRYPTO_ALG_TYPE_AHASH,

				 CRYPTO_ALG_TYPE_AHASH_MASK);

	tfm = crypto_alloc_ahash(alg, 0, 0);

	if (IS_ERR(tfm))

		return PTR_ERR(tfm);

drivers/crypto/marvell/hash.c

+1 −2
Original line number Diff line number Diff line
@@ -1183,8 +1183,7 @@ static int mv_cesa_ahmac_setkey(const char *hash_alg_name, 
	u8 *opad;

	int ret;



	tfm = crypto_alloc_ahash(hash_alg_name, CRYPTO_ALG_TYPE_AHASH,

				 CRYPTO_ALG_TYPE_AHASH_MASK);

	tfm = crypto_alloc_ahash(hash_alg_name, 0, 0);

	if (IS_ERR(tfm))

		return PTR_ERR(tfm);

drivers/crypto/qce/sha.c

+1 −2
Original line number Diff line number Diff line
@@ -378,8 +378,7 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, 
	else

		return -EINVAL;



	ahash_tfm = crypto_alloc_ahash(alg_name, CRYPTO_ALG_TYPE_AHASH,

				       CRYPTO_ALG_TYPE_AHASH_MASK);

	ahash_tfm = crypto_alloc_ahash(alg_name, 0, 0);

	if (IS_ERR(ahash_tfm))

		return PTR_ERR(ahash_tfm);