mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2018-06-30 15:16:16 -07:00 committed by Herbert Xu
parent 2c95e6d978
commit 85d7311f19
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/crypto/api-samples.rst
View File

@ -162,7 +162,7 @@ Code Example For Use of Operational State Memory With SHASH
char *hash_alg_name = "sha1-padlock-nano"; char *hash_alg_name = "sha1-padlock-nano";
int ret; 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)) { if (IS_ERR(alg)) {
pr_info("can't alloc alg %s\n", hash_alg_name); pr_info("can't alloc alg %s\n", hash_alg_name);
return PTR_ERR(alg); return PTR_ERR(alg);

4
drivers/crypto/atmel-sha.c
View File

@ -2316,9 +2316,7 @@ struct atmel_sha_authenc_ctx *atmel_sha_authenc_spawn(unsigned long mode)
goto error; goto error;
} }
tfm = crypto_alloc_ahash(name, tfm = crypto_alloc_ahash(name, 0, 0);
CRYPTO_ALG_TYPE_AHASH,
CRYPTO_ALG_TYPE_AHASH_MASK);
if (IS_ERR(tfm)) { if (IS_ERR(tfm)) {
err = PTR_ERR(tfm); err = PTR_ERR(tfm);
goto error; goto error;

3
drivers/crypto/inside-secure/safexcel_hash.c
View File

@ -941,8 +941,7 @@ int safexcel_hmac_setkey(const char *alg, const u8 *key, unsigned int keylen,
u8 *ipad, *opad; u8 *ipad, *opad;
int ret; int ret;
tfm = crypto_alloc_ahash(alg, CRYPTO_ALG_TYPE_AHASH, tfm = crypto_alloc_ahash(alg, 0, 0);
CRYPTO_ALG_TYPE_AHASH_MASK);
if (IS_ERR(tfm)) if (IS_ERR(tfm))
return PTR_ERR(tfm); return PTR_ERR(tfm);

3
drivers/crypto/marvell/hash.c
View File

@ -1183,8 +1183,7 @@ static int mv_cesa_ahmac_setkey(const char *hash_alg_name,
u8 *opad; u8 *opad;
int ret; int ret;
tfm = crypto_alloc_ahash(hash_alg_name, CRYPTO_ALG_TYPE_AHASH, tfm = crypto_alloc_ahash(hash_alg_name, 0, 0);
CRYPTO_ALG_TYPE_AHASH_MASK);
if (IS_ERR(tfm)) if (IS_ERR(tfm))
return PTR_ERR(tfm); return PTR_ERR(tfm);

3
drivers/crypto/qce/sha.c
View File

@ -378,8 +378,7 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
else else
return -EINVAL; return -EINVAL;
ahash_tfm = crypto_alloc_ahash(alg_name, CRYPTO_ALG_TYPE_AHASH, ahash_tfm = crypto_alloc_ahash(alg_name, 0, 0);
CRYPTO_ALG_TYPE_AHASH_MASK);
if (IS_ERR(ahash_tfm)) if (IS_ERR(ahash_tfm))
return PTR_ERR(ahash_tfm); return PTR_ERR(ahash_tfm);

2
security/keys/dh.c
View File

@ -315,7 +315,7 @@ long __keyctl_dh_compute(struct keyctl_dh_params __user *params,
if (ret) if (ret)
goto out3; goto out3;
tfm = crypto_alloc_kpp("dh", CRYPTO_ALG_TYPE_KPP, 0); tfm = crypto_alloc_kpp("dh", 0, 0);
if (IS_ERR(tfm)) { if (IS_ERR(tfm)) {
ret = PTR_ERR(tfm); ret = PTR_ERR(tfm);
goto out3; goto out3;