Skip to content

Commit

Permalink
crypto: ahash - remove useless setting of cra_type
Browse files Browse the repository at this point in the history 
Some ahash algorithms set .cra_type = &crypto_ahash_type.  But this is
redundant with the C structure type ('struct ahash_alg'), and
crypto_register_ahash() already sets the .cra_type automatically.
Apparently the useless assignment has just been copy+pasted around.

So, remove the useless assignment from all the ahash algorithms.

This patch shouldn't change any actual behavior.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Eric Biggers authored and Herbert Xu committed Jul 8, 2018
1 parent 6a38f62 commit c87a405
Show file tree
Hide file tree
Showing 14 changed files with 0 additions and 17 deletions.
1 change: 0 additions & 1 deletion arch/arm/crypto/ghash-ce-glue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@ static struct ahash_alg ghash_async_alg = {
.cra_priority = 300,
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = GHASH_BLOCK_SIZE,
.cra_type = &crypto_ahash_type,
.cra_ctxsize = sizeof(struct ghash_async_ctx),
.cra_module = THIS_MODULE,
.cra_init = ghash_async_init_tfm,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/crypto/ghash-clmulni-intel_glue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ static struct ahash_alg ghash_async_alg = {
.cra_ctxsize = sizeof(struct ghash_async_ctx),
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = GHASH_BLOCK_SIZE,
.cra_type = &crypto_ahash_type,
.cra_module = THIS_MODULE,
.cra_init = ghash_async_init_tfm,
.cra_exit = ghash_async_exit_tfm,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/crypto/sha1-mb/sha1_mb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,6 @@ static struct ahash_alg sha1_mb_async_alg = {
.cra_priority = 50,
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = SHA1_BLOCK_SIZE,
.cra_type = &crypto_ahash_type,
.cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(sha1_mb_async_alg.halg.base.cra_list),
.cra_init = sha1_mb_async_init_tfm,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/crypto/sha256-mb/sha256_mb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,6 @@ static struct ahash_alg sha256_mb_async_alg = {
.cra_priority = 50,
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = SHA256_BLOCK_SIZE,
.cra_type = &crypto_ahash_type,
.cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT
(sha256_mb_async_alg.halg.base.cra_list),
Expand Down
1 change: 0 additions & 1 deletion arch/x86/crypto/sha512-mb/sha512_mb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,6 @@ static struct ahash_alg sha512_mb_async_alg = {
.cra_priority = 50,
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = SHA512_BLOCK_SIZE,
.cra_type = &crypto_ahash_type,
.cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT
(sha512_mb_async_alg.halg.base.cra_list),
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/bcm/cipher.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4648,7 +4648,6 @@ static int spu_register_ahash(struct iproc_alg_s *driver_alg)
hash->halg.base.cra_ctxsize = sizeof(struct iproc_ctx_s);
hash->halg.base.cra_init = ahash_cra_init;
hash->halg.base.cra_exit = generic_cra_exit;
hash->halg.base.cra_type = &crypto_ahash_type;
hash->halg.base.cra_flags = CRYPTO_ALG_ASYNC;
hash->halg.statesize = sizeof(struct spu_hash_export_s);

Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/caam/caamhash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,6 @@ caam_hash_alloc(struct caam_hash_template *template,
alg->cra_blocksize = template->blocksize;
alg->cra_alignmask = 0;
alg->cra_flags = CRYPTO_ALG_ASYNC;
alg->cra_type = &crypto_ahash_type;

t_alg->alg_type = template->alg_type;

Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/ccp/ccp-crypto-aes-cmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ int ccp_register_aes_cmac_algs(struct list_head *head)
base->cra_blocksize = AES_BLOCK_SIZE;
base->cra_ctxsize = sizeof(struct ccp_ctx);
base->cra_priority = CCP_CRA_PRIORITY;
base->cra_type = &crypto_ahash_type;
base->cra_init = ccp_aes_cmac_cra_init;
base->cra_exit = ccp_aes_cmac_cra_exit;
base->cra_module = THIS_MODULE;
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/ccp/ccp-crypto-sha.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,6 @@ static int ccp_register_sha_alg(struct list_head *head,
base->cra_blocksize = def->block_size;
base->cra_ctxsize = sizeof(struct ccp_ctx);
base->cra_priority = CCP_CRA_PRIORITY;
base->cra_type = &crypto_ahash_type;
base->cra_init = ccp_sha_cra_init;
base->cra_exit = ccp_sha_cra_exit;
base->cra_module = THIS_MODULE;
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/ccree/cc_hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,6 @@ static struct cc_hash_alg *cc_alloc_hash_alg(struct cc_hash_template *template,

alg->cra_init = cc_cra_init;
alg->cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY;
alg->cra_type = &crypto_ahash_type;

t_crypto_alg->hash_mode = template->hash_mode;
t_crypto_alg->hw_mode = template->hw_mode;
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/chelsio/chcr_algo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4260,7 +4260,6 @@ static int chcr_register_alg(void)
a_hash->halg.base.cra_flags = CRYPTO_ALG_ASYNC;
a_hash->halg.base.cra_alignmask = 0;
a_hash->halg.base.cra_exit = NULL;
a_hash->halg.base.cra_type = &crypto_ahash_type;

if (driver_algs[i].type == CRYPTO_ALG_TYPE_HMAC) {
a_hash->halg.base.cra_init = chcr_hmac_cra_init;
Expand Down
2 changes: 0 additions & 2 deletions drivers/crypto/sunxi-ss/sun4i-ss-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct sun4i_req_ctx),
.cra_module = THIS_MODULE,
.cra_type = &crypto_ahash_type,
.cra_init = sun4i_hash_crainit
}
}
Expand All @@ -75,7 +74,6 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_blocksize = SHA1_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct sun4i_req_ctx),
.cra_module = THIS_MODULE,
.cra_type = &crypto_ahash_type,
.cra_init = sun4i_hash_crainit
}
}
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/talitos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3174,7 +3174,6 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
alg = &t_alg->algt.alg.hash.halg.base;
alg->cra_init = talitos_cra_init_ahash;
alg->cra_exit = talitos_cra_exit;
alg->cra_type = &crypto_ahash_type;
t_alg->algt.alg.hash.init = ahash_init;
t_alg->algt.alg.hash.update = ahash_update;
t_alg->algt.alg.hash.final = ahash_final;
Expand Down
3 changes: 0 additions & 3 deletions drivers/crypto/ux500/hash/hash_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,6 @@ static struct hash_algo_template hash_algs[] = {
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = SHA256_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct hash_ctx),
.cra_type = &crypto_ahash_type,
.cra_init = hash_cra_init,
.cra_module = THIS_MODULE,
}
Expand All @@ -1575,7 +1574,6 @@ static struct hash_algo_template hash_algs[] = {
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = SHA1_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct hash_ctx),
.cra_type = &crypto_ahash_type,
.cra_init = hash_cra_init,
.cra_module = THIS_MODULE,
}
Expand All @@ -1600,7 +1598,6 @@ static struct hash_algo_template hash_algs[] = {
.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = SHA256_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct hash_ctx),
.cra_type = &crypto_ahash_type,
.cra_init = hash_cra_init,
.cra_module = THIS_MODULE,
}
Expand Down

0 comments on commit c87a405

Please sign in to comment.