UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: aead - remove useless setting of type flags 

Some aead algorithms set .cra_flags = CRYPTO_ALG_TYPE_AEAD.  But this is
redundant with the C structure type ('struct aead_alg'), and
crypto_register_aead() 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 aead algorithms.

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:14 -07:00 committed by Herbert Xu
parent c87a405e3b
commit 3f4a537a26
10 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/crypto/aes_s390.c
View File

@ -1035,7 +1035,6 @@ static struct aead_alg gcm_aes_aead = {
.chunksize = AES_BLOCK_SIZE, .chunksize = AES_BLOCK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_AEAD,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct s390_aes_ctx), .cra_ctxsize = sizeof(struct s390_aes_ctx),
.cra_priority = 900, .cra_priority = 900,

1
crypto/aegis128.c
View File

@ -429,7 +429,6 @@ static struct aead_alg crypto_aegis128_alg = {
.chunksize = AEGIS_BLOCK_SIZE, .chunksize = AEGIS_BLOCK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_AEAD,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct aegis_ctx), .cra_ctxsize = sizeof(struct aegis_ctx),
.cra_alignmask = 0, .cra_alignmask = 0,

1
crypto/aegis128l.c
View File

@ -493,7 +493,6 @@ static struct aead_alg crypto_aegis128l_alg = {
.chunksize = AEGIS128L_CHUNK_SIZE, .chunksize = AEGIS128L_CHUNK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_AEAD,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct aegis_ctx), .cra_ctxsize = sizeof(struct aegis_ctx),
.cra_alignmask = 0, .cra_alignmask = 0,

1
crypto/aegis256.c
View File

@ -444,7 +444,6 @@ static struct aead_alg crypto_aegis256_alg = {
.chunksize = AEGIS_BLOCK_SIZE, .chunksize = AEGIS_BLOCK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_AEAD,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct aegis_ctx), .cra_ctxsize = sizeof(struct aegis_ctx),
.cra_alignmask = 0, .cra_alignmask = 0,

1
crypto/morus1280.c
View File

@ -514,7 +514,6 @@ static struct aead_alg crypto_morus1280_alg = {
.chunksize = MORUS1280_BLOCK_SIZE, .chunksize = MORUS1280_BLOCK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_AEAD,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct morus1280_ctx), .cra_ctxsize = sizeof(struct morus1280_ctx),
.cra_alignmask = 0, .cra_alignmask = 0,

1
crypto/morus640.c
View File

@ -510,7 +510,6 @@ static struct aead_alg crypto_morus640_alg = {
.chunksize = MORUS640_BLOCK_SIZE, .chunksize = MORUS640_BLOCK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_AEAD,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct morus640_ctx), .cra_ctxsize = sizeof(struct morus640_ctx),
.cra_alignmask = 0, .cra_alignmask = 0,

2
drivers/crypto/axis/artpec6_crypto.c
View File

@ -2964,7 +2964,7 @@ static struct aead_alg aead_algos[] = {
.cra_name = "gcm(aes)", .cra_name = "gcm(aes)",
.cra_driver_name = "artpec-gcm-aes", .cra_driver_name = "artpec-gcm-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC | .cra_flags = CRYPTO_ALG_ASYNC |
CRYPTO_ALG_KERN_DRIVER_ONLY, CRYPTO_ALG_KERN_DRIVER_ONLY,
.cra_blocksize = 1, .cra_blocksize = 1,
.cra_ctxsize = sizeof(struct artpec6_cryptotfm_context), .cra_ctxsize = sizeof(struct artpec6_cryptotfm_context),

2
drivers/crypto/bcm/cipher.c
View File

@ -4689,7 +4689,7 @@ static int spu_register_aead(struct iproc_alg_s *driver_alg)
aead->base.cra_ctxsize = sizeof(struct iproc_ctx_s); aead->base.cra_ctxsize = sizeof(struct iproc_ctx_s);
INIT_LIST_HEAD(&aead->base.cra_list); INIT_LIST_HEAD(&aead->base.cra_list);
aead->base.cra_flags |= CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC; aead->base.cra_flags |= CRYPTO_ALG_ASYNC;
/* setkey set in alg initialization */ /* setkey set in alg initialization */
aead->setauthsize = aead_setauthsize; aead->setauthsize = aead_setauthsize;
aead->encrypt = aead_encrypt; aead->encrypt = aead_encrypt;

3
drivers/crypto/chelsio/chcr_algo.c
View File

@ -4236,8 +4236,7 @@ static int chcr_register_alg(void)
break; break;
case CRYPTO_ALG_TYPE_AEAD: case CRYPTO_ALG_TYPE_AEAD:
driver_algs[i].alg.aead.base.cra_flags = driver_algs[i].alg.aead.base.cra_flags =
CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC | CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK;
CRYPTO_ALG_NEED_FALLBACK;
driver_algs[i].alg.aead.encrypt = chcr_aead_encrypt; driver_algs[i].alg.aead.encrypt = chcr_aead_encrypt;
driver_algs[i].alg.aead.decrypt = chcr_aead_decrypt; driver_algs[i].alg.aead.decrypt = chcr_aead_decrypt;
driver_algs[i].alg.aead.init = chcr_aead_cra_init; driver_algs[i].alg.aead.init = chcr_aead_cra_init;

10
drivers/crypto/inside-secure/safexcel_cipher.c
View File

@ -1186,7 +1186,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_aes = {
.cra_name = "authenc(hmac(sha1),cbc(aes))", .cra_name = "authenc(hmac(sha1),cbc(aes))",
.cra_driver_name = "safexcel-authenc-hmac-sha1-cbc-aes", .cra_driver_name = "safexcel-authenc-hmac-sha1-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_AEAD | 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),
@ -1221,7 +1221,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes = {
.cra_name = "authenc(hmac(sha256),cbc(aes))", .cra_name = "authenc(hmac(sha256),cbc(aes))",
.cra_driver_name = "safexcel-authenc-hmac-sha256-cbc-aes", .cra_driver_name = "safexcel-authenc-hmac-sha256-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_AEAD | 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),
@ -1256,7 +1256,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes = {
.cra_name = "authenc(hmac(sha224),cbc(aes))", .cra_name = "authenc(hmac(sha224),cbc(aes))",
.cra_driver_name = "safexcel-authenc-hmac-sha224-cbc-aes", .cra_driver_name = "safexcel-authenc-hmac-sha224-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_AEAD | 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),
@ -1291,7 +1291,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_aes = {
.cra_name = "authenc(hmac(sha512),cbc(aes))", .cra_name = "authenc(hmac(sha512),cbc(aes))",
.cra_driver_name = "safexcel-authenc-hmac-sha512-cbc-aes", .cra_driver_name = "safexcel-authenc-hmac-sha512-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_AEAD | 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),
@ -1326,7 +1326,7 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha384_cbc_aes = {
.cra_name = "authenc(hmac(sha384),cbc(aes))", .cra_name = "authenc(hmac(sha384),cbc(aes))",
.cra_driver_name = "safexcel-authenc-hmac-sha384-cbc-aes", .cra_driver_name = "safexcel-authenc-hmac-sha384-cbc-aes",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_AEAD | 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),