Skip to content

L
linux
Commit 2c95e6d9 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files
Options

crypto: skcipher - remove useless setting of type flags 

Some skcipher algorithms set .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER.  But
this is redundant with the C structure type ('struct skcipher_alg'), and
crypto_register_skcipher() already sets the type flag automatically,
clearing any type flag that was already there.  Apparently the useless
assignment has just been copy+pasted around.

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

This patch shouldn't change any actual behavior.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3f4a537a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 35 deletions
drivers/crypto/amcc/crypto4xx_core.c
View file @ 2c95e6d9
...@@ -1132,8 +1132,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { ...@@ -1132,8 +1132,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
.cra_name = "cbc(aes)", .cra_name = "cbc(aes)",
.cra_driver_name = "cbc-aes-ppc4xx", .cra_driver_name = "cbc-aes-ppc4xx",
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_ctxsize = sizeof(struct crypto4xx_ctx),
...@@ -1153,8 +1152,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { ...@@ -1153,8 +1152,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
.cra_name = "cfb(aes)", .cra_name = "cfb(aes)",
.cra_driver_name = "cfb-aes-ppc4xx", .cra_driver_name = "cfb-aes-ppc4xx",
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_ctxsize = sizeof(struct crypto4xx_ctx),
...@@ -1174,8 +1172,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { ...@@ -1174,8 +1172,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
.cra_name = "ctr(aes)", .cra_name = "ctr(aes)",
.cra_driver_name = "ctr-aes-ppc4xx", .cra_driver_name = "ctr-aes-ppc4xx",
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_NEED_FALLBACK |
CRYPTO_ALG_NEED_FALLBACK |
CRYPTO_ALG_ASYNC | CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
...@@ -1196,8 +1193,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { ...@@ -1196,8 +1193,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
.cra_name = "rfc3686(ctr(aes))", .cra_name = "rfc3686(ctr(aes))",
.cra_driver_name = "rfc3686-ctr-aes-ppc4xx", .cra_driver_name = "rfc3686-ctr-aes-ppc4xx",
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_ctxsize = sizeof(struct crypto4xx_ctx),
...@@ -1217,8 +1213,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { ...@@ -1217,8 +1213,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
.cra_name = "ecb(aes)", .cra_name = "ecb(aes)",
.cra_driver_name = "ecb-aes-ppc4xx", .cra_driver_name = "ecb-aes-ppc4xx",
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_ctxsize = sizeof(struct crypto4xx_ctx),
...@@ -1237,8 +1232,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = { ...@@ -1237,8 +1232,7 @@ static struct crypto4xx_alg_common crypto4xx_alg[] = {
.cra_name = "ofb(aes)", .cra_name = "ofb(aes)",
.cra_driver_name = "ofb-aes-ppc4xx", .cra_driver_name = "ofb-aes-ppc4xx",
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_ctxsize = sizeof(struct crypto4xx_ctx),
......
drivers/crypto/axis/artpec6_crypto.c
View file @ 2c95e6d9
...@@ -2867,8 +2867,7 @@ static struct skcipher_alg crypto_algos[] = { ...@@ -2867,8 +2867,7 @@ static struct skcipher_alg crypto_algos[] = {
.cra_name = "ecb(aes)", .cra_name = "ecb(aes)",
.cra_driver_name = "artpec6-ecb-aes", .cra_driver_name = "artpec6-ecb-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC,
CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct artpec6_cryptotfm_context), .cra_ctxsize = sizeof(struct artpec6_cryptotfm_context),
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -2888,8 +2887,7 @@ static struct skcipher_alg crypto_algos[] = { ...@@ -2888,8 +2887,7 @@ static struct skcipher_alg crypto_algos[] = {
.cra_name = "ctr(aes)", .cra_name = "ctr(aes)",
.cra_driver_name = "artpec6-ctr-aes", .cra_driver_name = "artpec6-ctr-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_ASYNC |
CRYPTO_ALG_NEED_FALLBACK, CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct artpec6_cryptotfm_context), .cra_ctxsize = sizeof(struct artpec6_cryptotfm_context),
...@@ -2911,8 +2909,7 @@ static struct skcipher_alg crypto_algos[] = { ...@@ -2911,8 +2909,7 @@ static struct skcipher_alg crypto_algos[] = {
.cra_name = "cbc(aes)", .cra_name = "cbc(aes)",
.cra_driver_name = "artpec6-cbc-aes", .cra_driver_name = "artpec6-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC,
CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct artpec6_cryptotfm_context), .cra_ctxsize = sizeof(struct artpec6_cryptotfm_context),
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -2933,8 +2930,7 @@ static struct skcipher_alg crypto_algos[] = { ...@@ -2933,8 +2930,7 @@ static struct skcipher_alg crypto_algos[] = {
.cra_name = "xts(aes)", .cra_name = "xts(aes)",
.cra_driver_name = "artpec6-xts-aes", .cra_driver_name = "artpec6-xts-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_ASYNC,
CRYPTO_ALG_ASYNC,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct artpec6_cryptotfm_context), .cra_ctxsize = sizeof(struct artpec6_cryptotfm_context),
.cra_alignmask = 3, .cra_alignmask = 3,
......
drivers/crypto/ccree/cc_cipher.c
View file @ 2c95e6d9
...@@ -1338,8 +1338,7 @@ static struct cc_crypto_alg *cc_create_alg(const struct cc_alg_template *tmpl, ...@@ -1338,8 +1338,7 @@ static struct cc_crypto_alg *cc_create_alg(const struct cc_alg_template *tmpl,
alg->base.cra_init = cc_cipher_init; alg->base.cra_init = cc_cipher_init;
alg->base.cra_exit = cc_cipher_exit; alg->base.cra_exit = cc_cipher_exit;
alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY | alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY;
CRYPTO_ALG_TYPE_SKCIPHER;
t_alg->cipher_mode = tmpl->cipher_mode; t_alg->cipher_mode = tmpl->cipher_mode;
t_alg->flow_mode = tmpl->flow_mode; t_alg->flow_mode = tmpl->flow_mode;
......
drivers/crypto/inside-secure/safexcel_cipher.c
View file @ 2c95e6d9
...@@ -863,7 +863,7 @@ struct safexcel_alg_template safexcel_alg_ecb_aes = { ...@@ -863,7 +863,7 @@ struct safexcel_alg_template safexcel_alg_ecb_aes = {
.cra_name = "ecb(aes)", .cra_name = "ecb(aes)",
.cra_driver_name = "safexcel-ecb-aes", .cra_driver_name = "safexcel-ecb-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | CRYPTO_ALG_ASYNC | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx), .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
...@@ -903,7 +903,7 @@ struct safexcel_alg_template safexcel_alg_cbc_aes = { ...@@ -903,7 +903,7 @@ struct safexcel_alg_template safexcel_alg_cbc_aes = {
.cra_name = "cbc(aes)", .cra_name = "cbc(aes)",
.cra_driver_name = "safexcel-cbc-aes", .cra_driver_name = "safexcel-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | CRYPTO_ALG_ASYNC | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx), .cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
......
drivers/crypto/sunxi-ss/sun4i-ss-core.c
View file @ 2c95e6d9
...@@ -92,8 +92,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { ...@@ -92,8 +92,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_driver_name = "cbc-aes-sun4i-ss", .cra_driver_name = "cbc-aes-sun4i-ss",
.cra_priority = 300, .cra_priority = 300,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,
CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_ctxsize = sizeof(struct sun4i_tfm_ctx), .cra_ctxsize = sizeof(struct sun4i_tfm_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -114,8 +113,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { ...@@ -114,8 +113,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_driver_name = "ecb-aes-sun4i-ss", .cra_driver_name = "ecb-aes-sun4i-ss",
.cra_priority = 300, .cra_priority = 300,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,
CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_ctxsize = sizeof(struct sun4i_tfm_ctx), .cra_ctxsize = sizeof(struct sun4i_tfm_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -136,8 +134,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { ...@@ -136,8 +134,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_driver_name = "cbc-des-sun4i-ss", .cra_driver_name = "cbc-des-sun4i-ss",
.cra_priority = 300, .cra_priority = 300,
.cra_blocksize = DES_BLOCK_SIZE, .cra_blocksize = DES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,
CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_ctxsize = sizeof(struct sun4i_req_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -157,8 +154,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { ...@@ -157,8 +154,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_driver_name = "ecb-des-sun4i-ss", .cra_driver_name = "ecb-des-sun4i-ss",
.cra_priority = 300, .cra_priority = 300,
.cra_blocksize = DES_BLOCK_SIZE, .cra_blocksize = DES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,
CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_ctxsize = sizeof(struct sun4i_req_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -179,8 +175,7 @@ static struct sun4i_ss_alg_template ss_algs[] = { ...@@ -179,8 +175,7 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_driver_name = "cbc-des3-sun4i-ss", .cra_driver_name = "cbc-des3-sun4i-ss",
.cra_priority = 300, .cra_priority = 300,
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER | .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY,
CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_ctxsize = sizeof(struct sun4i_req_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3, .cra_alignmask = 3,
...@@ -201,7 +196,6 @@ static struct sun4i_ss_alg_template ss_algs[] = { ...@@ -201,7 +196,6 @@ static struct sun4i_ss_alg_template ss_algs[] = {
.cra_driver_name = "ecb-des3-sun4i-ss", .cra_driver_name = "ecb-des3-sun4i-ss",
.cra_priority = 300, .cra_priority = 300,
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_SKCIPHER,
.cra_ctxsize = sizeof(struct sun4i_req_ctx), .cra_ctxsize = sizeof(struct sun4i_req_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3, .cra_alignmask = 3,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7