Skip to content

L
linux
Commit 76c9e53e authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Herbert Xu
Browse files
Options

crypto: ccree - drop useless type flag during reg 

Drop the explicit setting of CRYPTO_ALG_TYPE_AEAD or
CRYPTO_ALG_TYPE_SKCIPHER flags during alg registration as they are
set anyway by the framework.
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 318abdfb
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 30 deletions
drivers/crypto/ccree/cc_aead.c
View file @ 76c9e53e
...@@ -2344,7 +2344,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2344,7 +2344,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(hmac(sha1),cbc(aes))", .name = "authenc(hmac(sha1),cbc(aes))",
.driver_name = "authenc-hmac-sha1-cbc-aes-ccree", .driver_name = "authenc-hmac-sha1-cbc-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2364,7 +2363,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2364,7 +2363,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(hmac(sha1),cbc(des3_ede))", .name = "authenc(hmac(sha1),cbc(des3_ede))",
.driver_name = "authenc-hmac-sha1-cbc-des3-ccree", .driver_name = "authenc-hmac-sha1-cbc-des3-ccree",
.blocksize = DES3_EDE_BLOCK_SIZE, .blocksize = DES3_EDE_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2384,7 +2382,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2384,7 +2382,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(hmac(sha256),cbc(aes))", .name = "authenc(hmac(sha256),cbc(aes))",
.driver_name = "authenc-hmac-sha256-cbc-aes-ccree", .driver_name = "authenc-hmac-sha256-cbc-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2404,7 +2401,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2404,7 +2401,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(hmac(sha256),cbc(des3_ede))", .name = "authenc(hmac(sha256),cbc(des3_ede))",
.driver_name = "authenc-hmac-sha256-cbc-des3-ccree", .driver_name = "authenc-hmac-sha256-cbc-des3-ccree",
.blocksize = DES3_EDE_BLOCK_SIZE, .blocksize = DES3_EDE_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2424,7 +2420,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2424,7 +2420,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(xcbc(aes),cbc(aes))", .name = "authenc(xcbc(aes),cbc(aes))",
.driver_name = "authenc-xcbc-aes-cbc-aes-ccree", .driver_name = "authenc-xcbc-aes-cbc-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2444,7 +2439,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2444,7 +2439,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(hmac(sha1),rfc3686(ctr(aes)))", .name = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
.driver_name = "authenc-hmac-sha1-rfc3686-ctr-aes-ccree", .driver_name = "authenc-hmac-sha1-rfc3686-ctr-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2464,7 +2458,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2464,7 +2458,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(hmac(sha256),rfc3686(ctr(aes)))", .name = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
.driver_name = "authenc-hmac-sha256-rfc3686-ctr-aes-ccree", .driver_name = "authenc-hmac-sha256-rfc3686-ctr-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2484,7 +2477,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2484,7 +2477,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "authenc(xcbc(aes),rfc3686(ctr(aes)))", .name = "authenc(xcbc(aes),rfc3686(ctr(aes)))",
.driver_name = "authenc-xcbc-aes-rfc3686-ctr-aes-ccree", .driver_name = "authenc-xcbc-aes-rfc3686-ctr-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_aead_setauthsize, .setauthsize = cc_aead_setauthsize,
...@@ -2504,7 +2496,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2504,7 +2496,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "ccm(aes)", .name = "ccm(aes)",
.driver_name = "ccm-aes-ccree", .driver_name = "ccm-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_ccm_setauthsize, .setauthsize = cc_ccm_setauthsize,
...@@ -2524,7 +2515,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2524,7 +2515,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "rfc4309(ccm(aes))", .name = "rfc4309(ccm(aes))",
.driver_name = "rfc4309-ccm-aes-ccree", .driver_name = "rfc4309-ccm-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_rfc4309_ccm_setkey, .setkey = cc_rfc4309_ccm_setkey,
.setauthsize = cc_rfc4309_ccm_setauthsize, .setauthsize = cc_rfc4309_ccm_setauthsize,
...@@ -2544,7 +2534,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2544,7 +2534,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "gcm(aes)", .name = "gcm(aes)",
.driver_name = "gcm-aes-ccree", .driver_name = "gcm-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_aead_setkey, .setkey = cc_aead_setkey,
.setauthsize = cc_gcm_setauthsize, .setauthsize = cc_gcm_setauthsize,
...@@ -2564,7 +2553,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2564,7 +2553,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "rfc4106(gcm(aes))", .name = "rfc4106(gcm(aes))",
.driver_name = "rfc4106-gcm-aes-ccree", .driver_name = "rfc4106-gcm-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_rfc4106_gcm_setkey, .setkey = cc_rfc4106_gcm_setkey,
.setauthsize = cc_rfc4106_gcm_setauthsize, .setauthsize = cc_rfc4106_gcm_setauthsize,
...@@ -2584,7 +2572,6 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2584,7 +2572,6 @@ static struct cc_alg_template aead_algs[] = {
.name = "rfc4543(gcm(aes))", .name = "rfc4543(gcm(aes))",
.driver_name = "rfc4543-gcm-aes-ccree", .driver_name = "rfc4543-gcm-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_AEAD,
.template_aead = { .template_aead = {
.setkey = cc_rfc4543_gcm_setkey, .setkey = cc_rfc4543_gcm_setkey,
.setauthsize = cc_rfc4543_gcm_setauthsize, .setauthsize = cc_rfc4543_gcm_setauthsize,
...@@ -2621,8 +2608,7 @@ static struct cc_crypto_alg *cc_create_aead_alg(struct cc_alg_template *tmpl, ...@@ -2621,8 +2608,7 @@ static struct cc_crypto_alg *cc_create_aead_alg(struct cc_alg_template *tmpl,
alg->base.cra_priority = CC_CRA_PRIO; alg->base.cra_priority = CC_CRA_PRIO;
alg->base.cra_ctxsize = sizeof(struct cc_aead_ctx); alg->base.cra_ctxsize = sizeof(struct cc_aead_ctx);
alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY | alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY;
tmpl->type;
alg->init = cc_aead_init; alg->init = cc_aead_init;
alg->exit = cc_aead_exit; alg->exit = cc_aead_exit;
......
drivers/crypto/ccree/cc_cipher.c
View file @ 76c9e53e
...@@ -968,7 +968,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -968,7 +968,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ecb(paes)", .name = "ecb(paes)",
.driver_name = "ecb-paes-ccree", .driver_name = "ecb-paes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_sethkey, .setkey = cc_cipher_sethkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -985,7 +984,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -985,7 +984,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "cbc(paes)", .name = "cbc(paes)",
.driver_name = "cbc-paes-ccree", .driver_name = "cbc-paes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_sethkey, .setkey = cc_cipher_sethkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1002,7 +1000,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1002,7 +1000,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ofb(paes)", .name = "ofb(paes)",
.driver_name = "ofb-paes-ccree", .driver_name = "ofb-paes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_sethkey, .setkey = cc_cipher_sethkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1019,7 +1016,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1019,7 +1016,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "cts(cbc(paes))", .name = "cts(cbc(paes))",
.driver_name = "cts-cbc-paes-ccree", .driver_name = "cts-cbc-paes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_sethkey, .setkey = cc_cipher_sethkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1036,7 +1032,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1036,7 +1032,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ctr(paes)", .name = "ctr(paes)",
.driver_name = "ctr-paes-ccree", .driver_name = "ctr-paes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_sethkey, .setkey = cc_cipher_sethkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1203,7 +1198,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1203,7 +1198,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ecb(aes)", .name = "ecb(aes)",
.driver_name = "ecb-aes-ccree", .driver_name = "ecb-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1220,7 +1214,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1220,7 +1214,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "cbc(aes)", .name = "cbc(aes)",
.driver_name = "cbc-aes-ccree", .driver_name = "cbc-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1237,7 +1230,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1237,7 +1230,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ofb(aes)", .name = "ofb(aes)",
.driver_name = "ofb-aes-ccree", .driver_name = "ofb-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1254,7 +1246,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1254,7 +1246,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "cts(cbc(aes))", .name = "cts(cbc(aes))",
.driver_name = "cts-cbc-aes-ccree", .driver_name = "cts-cbc-aes-ccree",
.blocksize = AES_BLOCK_SIZE, .blocksize = AES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1271,7 +1262,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1271,7 +1262,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ctr(aes)", .name = "ctr(aes)",
.driver_name = "ctr-aes-ccree", .driver_name = "ctr-aes-ccree",
.blocksize = 1, .blocksize = 1,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1288,7 +1278,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1288,7 +1278,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "cbc(des3_ede)", .name = "cbc(des3_ede)",
.driver_name = "cbc-3des-ccree", .driver_name = "cbc-3des-ccree",
.blocksize = DES3_EDE_BLOCK_SIZE, .blocksize = DES3_EDE_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1305,7 +1294,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1305,7 +1294,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ecb(des3_ede)", .name = "ecb(des3_ede)",
.driver_name = "ecb-3des-ccree", .driver_name = "ecb-3des-ccree",
.blocksize = DES3_EDE_BLOCK_SIZE, .blocksize = DES3_EDE_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1322,7 +1310,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1322,7 +1310,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "cbc(des)", .name = "cbc(des)",
.driver_name = "cbc-des-ccree", .driver_name = "cbc-des-ccree",
.blocksize = DES_BLOCK_SIZE, .blocksize = DES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
...@@ -1339,7 +1326,6 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1339,7 +1326,6 @@ static const struct cc_alg_template skcipher_algs[] = {
.name = "ecb(des)", .name = "ecb(des)",
.driver_name = "ecb-des-ccree", .driver_name = "ecb-des-ccree",
.blocksize = DES_BLOCK_SIZE, .blocksize = DES_BLOCK_SIZE,
.type = CRYPTO_ALG_TYPE_ABLKCIPHER,
.template_skcipher = { .template_skcipher = {
.setkey = cc_cipher_setkey, .setkey = cc_cipher_setkey,
.encrypt = cc_cipher_encrypt, .encrypt = cc_cipher_encrypt,
......
drivers/crypto/ccree/cc_driver.h
View file @ 76c9e53e
...@@ -148,7 +148,6 @@ struct cc_alg_template { ...@@ -148,7 +148,6 @@ struct cc_alg_template {
char name[CRYPTO_MAX_ALG_NAME]; char name[CRYPTO_MAX_ALG_NAME];
char driver_name[CRYPTO_MAX_ALG_NAME]; char driver_name[CRYPTO_MAX_ALG_NAME];
unsigned int blocksize; unsigned int blocksize;
u32 type;
union { union {
struct skcipher_alg skcipher; struct skcipher_alg skcipher;
struct aead_alg aead; struct aead_alg aead;
......
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