Commit 9009b798 authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman

crypto: talitos - rename alternative AEAD algos.

commit a1a42f84 upstream.

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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Fixes: 7405c8d7 ("crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 043b0ea7
...@@ -2286,7 +2286,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2286,7 +2286,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,
}, },
...@@ -2330,7 +2330,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2330,7 +2330,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,
}, },
...@@ -2372,7 +2372,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2372,7 +2372,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,
}, },
...@@ -2416,7 +2416,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2416,7 +2416,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,
}, },
...@@ -2458,7 +2458,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2458,7 +2458,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,
}, },
...@@ -2502,7 +2502,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2502,7 +2502,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,
}, },
...@@ -2628,7 +2628,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2628,7 +2628,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,
}, },
...@@ -2670,7 +2670,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2670,7 +2670,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,
}, },
......
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