mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
This patch removes the CRYPTO_ALG_AEAD_NEW flag now that everyone has been converted. Signed-off-by: Herbert Xu <[email protected]>
This commit is contained in:
parent
b0d955ba46
commit
5e4b8c1fcc
20 changed files with 24 additions and 69 deletions
|
|
@ -4359,8 +4359,7 @@ static void caam_aead_alg_init(struct caam_aead_alg *t_alg)
|
|||
alg->base.cra_module = THIS_MODULE;
|
||||
alg->base.cra_priority = CAAM_CRA_PRIORITY;
|
||||
alg->base.cra_ctxsize = sizeof(struct caam_ctx);
|
||||
alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
|
||||
CRYPTO_ALG_AEAD_NEW;
|
||||
alg->base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY;
|
||||
|
||||
alg->init = caam_aead_init;
|
||||
alg->exit = caam_aead_exit;
|
||||
|
|
|
|||
|
|
@ -1451,7 +1451,6 @@ static int __init ixp_module_init(void)
|
|||
|
||||
/* authenc */
|
||||
cra->base.cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY |
|
||||
CRYPTO_ALG_AEAD_NEW |
|
||||
CRYPTO_ALG_ASYNC;
|
||||
cra->setkey = aead_setkey;
|
||||
cra->setauthsize = aead_setauthsize;
|
||||
|
|
|
|||
|
|
@ -559,8 +559,7 @@ struct aead_alg nx_ccm_aes_alg = {
|
|||
.cra_name = "ccm(aes)",
|
||||
.cra_driver_name = "ccm-aes-nx",
|
||||
.cra_priority = 300,
|
||||
.cra_flags = CRYPTO_ALG_NEED_FALLBACK |
|
||||
CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_flags = CRYPTO_ALG_NEED_FALLBACK,
|
||||
.cra_blocksize = 1,
|
||||
.cra_ctxsize = sizeof(struct nx_crypto_ctx),
|
||||
.cra_module = THIS_MODULE,
|
||||
|
|
@ -580,8 +579,7 @@ struct aead_alg nx_ccm4309_aes_alg = {
|
|||
.cra_name = "rfc4309(ccm(aes))",
|
||||
.cra_driver_name = "rfc4309-ccm-aes-nx",
|
||||
.cra_priority = 300,
|
||||
.cra_flags = CRYPTO_ALG_NEED_FALLBACK |
|
||||
CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_flags = CRYPTO_ALG_NEED_FALLBACK,
|
||||
.cra_blocksize = 1,
|
||||
.cra_ctxsize = sizeof(struct nx_crypto_ctx),
|
||||
.cra_module = THIS_MODULE,
|
||||
|
|
|
|||
|
|
@ -490,7 +490,6 @@ struct aead_alg nx_gcm_aes_alg = {
|
|||
.base = {
|
||||
.cra_name = "gcm(aes)",
|
||||
.cra_driver_name = "gcm-aes-nx",
|
||||
.cra_flags = CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_priority = 300,
|
||||
.cra_blocksize = 1,
|
||||
.cra_ctxsize = sizeof(struct nx_crypto_ctx),
|
||||
|
|
@ -509,7 +508,6 @@ struct aead_alg nx_gcm4106_aes_alg = {
|
|||
.base = {
|
||||
.cra_name = "rfc4106(gcm(aes))",
|
||||
.cra_driver_name = "rfc4106-gcm-aes-nx",
|
||||
.cra_flags = CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_priority = 300,
|
||||
.cra_blocksize = 1,
|
||||
.cra_ctxsize = sizeof(struct nx_crypto_ctx),
|
||||
|
|
|
|||
|
|
@ -1738,7 +1738,6 @@ static int spacc_probe(struct platform_device *pdev)
|
|||
INIT_LIST_HEAD(&engine->registered_aeads);
|
||||
for (i = 0; i < engine->num_aeads; ++i) {
|
||||
engine->aeads[i].engine = engine;
|
||||
engine->aeads[i].alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
|
||||
err = crypto_register_aead(&engine->aeads[i].alg);
|
||||
if (!err) {
|
||||
list_add_tail(&engine->aeads[i].entry,
|
||||
|
|
|
|||
|
|
@ -1109,7 +1109,7 @@ static struct aead_alg qat_aeads[] = { {
|
|||
.cra_name = "authenc(hmac(sha1),cbc(aes))",
|
||||
.cra_driver_name = "qat_aes_cbc_hmac_sha1",
|
||||
.cra_priority = 4001,
|
||||
.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_flags = CRYPTO_ALG_ASYNC,
|
||||
.cra_blocksize = AES_BLOCK_SIZE,
|
||||
.cra_ctxsize = sizeof(struct qat_alg_aead_ctx),
|
||||
.cra_module = THIS_MODULE,
|
||||
|
|
@ -1126,7 +1126,7 @@ static struct aead_alg qat_aeads[] = { {
|
|||
.cra_name = "authenc(hmac(sha256),cbc(aes))",
|
||||
.cra_driver_name = "qat_aes_cbc_hmac_sha256",
|
||||
.cra_priority = 4001,
|
||||
.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_flags = CRYPTO_ALG_ASYNC,
|
||||
.cra_blocksize = AES_BLOCK_SIZE,
|
||||
.cra_ctxsize = sizeof(struct qat_alg_aead_ctx),
|
||||
.cra_module = THIS_MODULE,
|
||||
|
|
@ -1143,7 +1143,7 @@ static struct aead_alg qat_aeads[] = { {
|
|||
.cra_name = "authenc(hmac(sha512),cbc(aes))",
|
||||
.cra_driver_name = "qat_aes_cbc_hmac_sha512",
|
||||
.cra_priority = 4001,
|
||||
.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW,
|
||||
.cra_flags = CRYPTO_ALG_ASYNC,
|
||||
.cra_blocksize = AES_BLOCK_SIZE,
|
||||
.cra_ctxsize = sizeof(struct qat_alg_aead_ctx),
|
||||
.cra_module = THIS_MODULE,
|
||||
|
|
@ -1197,7 +1197,7 @@ int qat_algs_register(void)
|
|||
goto unlock;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(qat_aeads); i++)
|
||||
qat_aeads[i].base.cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_AEAD_NEW;
|
||||
qat_aeads[i].base.cra_flags = CRYPTO_ALG_ASYNC;
|
||||
|
||||
ret = crypto_register_aeads(qat_aeads, ARRAY_SIZE(qat_aeads));
|
||||
if (ret)
|
||||
|
|
|
|||
|
|
@ -2730,7 +2730,6 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
|
|||
break;
|
||||
case CRYPTO_ALG_TYPE_AEAD:
|
||||
alg = &t_alg->algt.alg.aead.base;
|
||||
alg->cra_flags |= CRYPTO_ALG_AEAD_NEW;
|
||||
t_alg->algt.alg.aead.init = talitos_cra_init_aead;
|
||||
t_alg->algt.alg.aead.setkey = aead_setkey;
|
||||
t_alg->algt.alg.aead.encrypt = aead_encrypt;
|
||||
|
|
|
|||
Loading…
Reference in a new issue