You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
85 lines
3.4 KiB
Diff
85 lines
3.4 KiB
Diff
From 2c95e6d97892235b5b98cd4805e47fac87c2226f Mon Sep 17 00:00:00 2001
|
|
From: Eric Biggers <ebiggers@google.com>
|
|
Date: Sat, 30 Jun 2018 15:16:15 -0700
|
|
Subject: [PATCH 02/15] 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: Eric Biggers <ebiggers@google.com>
|
|
Acked-by: Gilad Ben-Yossef <gilad@benyossef.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_core.c | 18 ++++++------------
|
|
1 file changed, 6 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.c
|
|
@@ -1128,8 +1128,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_name = "cbc(aes)",
|
|
.cra_driver_name = "cbc-aes-ppc4xx",
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
|
|
- CRYPTO_ALG_ASYNC |
|
|
+ .cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
.cra_blocksize = AES_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|
|
@@ -1149,8 +1148,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_name = "cfb(aes)",
|
|
.cra_driver_name = "cfb-aes-ppc4xx",
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
|
|
- CRYPTO_ALG_ASYNC |
|
|
+ .cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
.cra_blocksize = AES_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|
|
@@ -1170,8 +1168,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_name = "ctr(aes)",
|
|
.cra_driver_name = "ctr-aes-ppc4xx",
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
|
|
- CRYPTO_ALG_NEED_FALLBACK |
|
|
+ .cra_flags = CRYPTO_ALG_NEED_FALLBACK |
|
|
CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
.cra_blocksize = AES_BLOCK_SIZE,
|
|
@@ -1192,8 +1189,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_name = "rfc3686(ctr(aes))",
|
|
.cra_driver_name = "rfc3686-ctr-aes-ppc4xx",
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
|
|
- CRYPTO_ALG_ASYNC |
|
|
+ .cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
.cra_blocksize = AES_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|
|
@@ -1213,8 +1209,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_name = "ecb(aes)",
|
|
.cra_driver_name = "ecb-aes-ppc4xx",
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
|
|
- CRYPTO_ALG_ASYNC |
|
|
+ .cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
.cra_blocksize = AES_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|
|
@@ -1233,8 +1228,7 @@ static struct crypto4xx_alg_common crypt
|
|
.cra_name = "ofb(aes)",
|
|
.cra_driver_name = "ofb-aes-ppc4xx",
|
|
.cra_priority = CRYPTO4XX_CRYPTO_PRIORITY,
|
|
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
|
|
- CRYPTO_ALG_ASYNC |
|
|
+ .cra_flags = CRYPTO_ALG_ASYNC |
|
|
CRYPTO_ALG_KERN_DRIVER_ONLY,
|
|
.cra_blocksize = AES_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct crypto4xx_ctx),
|