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

crypto: talitos - rename alternative AEAD algos. 

The talitos driver has two ways to perform AEAD depending on the
HW capability. Some HW support both. It is needed to give them
different names to distingish which one it is for instance when
a test fails.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Fixes: 7405c8d7ff ("crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU")
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Christophe Leroy 2019-05-21 13:34:08 +00:00 committed by Herbert Xu
parent 5e99a0a7a9
commit a1a42f8401
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/crypto/talitos.c
View File

@ -2356,7 +2356,7 @@ static struct talitos_alg_template driver_algs[] = {
.base = { .base = {
.cra_name = "authenc(hmac(sha1),cbc(aes))", .cra_name = "authenc(hmac(sha1),cbc(aes))",
.cra_driver_name = "authenc-hmac-sha1-" .cra_driver_name = "authenc-hmac-sha1-"
"cbc-aes-talitos", "cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2401,7 +2401,7 @@ static struct talitos_alg_template driver_algs[] = {
.cra_name = "authenc(hmac(sha1)," .cra_name = "authenc(hmac(sha1),"
"cbc(des3_ede))", "cbc(des3_ede))",
.cra_driver_name = "authenc-hmac-sha1-" .cra_driver_name = "authenc-hmac-sha1-"
"cbc-3des-talitos", "cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2444,7 +2444,7 @@ static struct talitos_alg_template driver_algs[] = {
.base = { .base = {
.cra_name = "authenc(hmac(sha224),cbc(aes))", .cra_name = "authenc(hmac(sha224),cbc(aes))",
.cra_driver_name = "authenc-hmac-sha224-" .cra_driver_name = "authenc-hmac-sha224-"
"cbc-aes-talitos", "cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2489,7 +2489,7 @@ static struct talitos_alg_template driver_algs[] = {
.cra_name = "authenc(hmac(sha224)," .cra_name = "authenc(hmac(sha224),"
"cbc(des3_ede))", "cbc(des3_ede))",
.cra_driver_name = "authenc-hmac-sha224-" .cra_driver_name = "authenc-hmac-sha224-"
"cbc-3des-talitos", "cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2532,7 +2532,7 @@ static struct talitos_alg_template driver_algs[] = {
.base = { .base = {
.cra_name = "authenc(hmac(sha256),cbc(aes))", .cra_name = "authenc(hmac(sha256),cbc(aes))",
.cra_driver_name = "authenc-hmac-sha256-" .cra_driver_name = "authenc-hmac-sha256-"
"cbc-aes-talitos", "cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2577,7 +2577,7 @@ static struct talitos_alg_template driver_algs[] = {
.cra_name = "authenc(hmac(sha256)," .cra_name = "authenc(hmac(sha256),"
"cbc(des3_ede))", "cbc(des3_ede))",
.cra_driver_name = "authenc-hmac-sha256-" .cra_driver_name = "authenc-hmac-sha256-"
"cbc-3des-talitos", "cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2706,7 +2706,7 @@ static struct talitos_alg_template driver_algs[] = {
.base = { .base = {
.cra_name = "authenc(hmac(md5),cbc(aes))", .cra_name = "authenc(hmac(md5),cbc(aes))",
.cra_driver_name = "authenc-hmac-md5-" .cra_driver_name = "authenc-hmac-md5-"
"cbc-aes-talitos", "cbc-aes-talitos-hsna",
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },
@ -2749,7 +2749,7 @@ static struct talitos_alg_template driver_algs[] = {
.base = { .base = {
.cra_name = "authenc(hmac(md5),cbc(des3_ede))", .cra_name = "authenc(hmac(md5),cbc(des3_ede))",
.cra_driver_name = "authenc-hmac-md5-" .cra_driver_name = "authenc-hmac-md5-"
"cbc-3des-talitos", "cbc-3des-talitos-hsna",
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_flags = CRYPTO_ALG_ASYNC, .cra_flags = CRYPTO_ALG_ASYNC,
}, },