aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorVakul Garg <vakul@freescale.com>2013-03-12 04:39:24 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2013-03-22 06:13:54 -0400
commitcb7d5662d7a13471eff81b25277a229d7173aabd (patch)
treedbea50ca71407e3390296c11a5226f8043e31422 /drivers/crypto
parent575c1bd549ff6bc097b3669b086e54e01169379f (diff)
crypto: caam - Fix missing init of '.type' in AEAD algos.
Following AEAD algo templates are updated for '.type' initialization. (a) authenc(hmac(sha224),cbc(aes)) (b) authenc(hmac(sha384),cbc(aes)) (c) authenc(hmac(sha224),cbc(des3_ede)) (d) authenc(hmac(sha384),cbc(des3_ede)) (e) authenc(hmac(sha224),cbc(des)) (f) authenc(hmac(sha384),cbc(des)) Signed-off-by: Vakul Garg <vakul@freescale.com> Reviewed-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/caam/caamalg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index b2a0a0726a54..42420fb3f50c 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1697,6 +1697,7 @@ static struct caam_alg_template driver_algs[] = {
1697 .name = "authenc(hmac(sha224),cbc(aes))", 1697 .name = "authenc(hmac(sha224),cbc(aes))",
1698 .driver_name = "authenc-hmac-sha224-cbc-aes-caam", 1698 .driver_name = "authenc-hmac-sha224-cbc-aes-caam",
1699 .blocksize = AES_BLOCK_SIZE, 1699 .blocksize = AES_BLOCK_SIZE,
1700 .type = CRYPTO_ALG_TYPE_AEAD,
1700 .template_aead = { 1701 .template_aead = {
1701 .setkey = aead_setkey, 1702 .setkey = aead_setkey,
1702 .setauthsize = aead_setauthsize, 1703 .setauthsize = aead_setauthsize,
@@ -1736,6 +1737,7 @@ static struct caam_alg_template driver_algs[] = {
1736 .name = "authenc(hmac(sha384),cbc(aes))", 1737 .name = "authenc(hmac(sha384),cbc(aes))",
1737 .driver_name = "authenc-hmac-sha384-cbc-aes-caam", 1738 .driver_name = "authenc-hmac-sha384-cbc-aes-caam",
1738 .blocksize = AES_BLOCK_SIZE, 1739 .blocksize = AES_BLOCK_SIZE,
1740 .type = CRYPTO_ALG_TYPE_AEAD,
1739 .template_aead = { 1741 .template_aead = {
1740 .setkey = aead_setkey, 1742 .setkey = aead_setkey,
1741 .setauthsize = aead_setauthsize, 1743 .setauthsize = aead_setauthsize,
@@ -1814,6 +1816,7 @@ static struct caam_alg_template driver_algs[] = {
1814 .name = "authenc(hmac(sha224),cbc(des3_ede))", 1816 .name = "authenc(hmac(sha224),cbc(des3_ede))",
1815 .driver_name = "authenc-hmac-sha224-cbc-des3_ede-caam", 1817 .driver_name = "authenc-hmac-sha224-cbc-des3_ede-caam",
1816 .blocksize = DES3_EDE_BLOCK_SIZE, 1818 .blocksize = DES3_EDE_BLOCK_SIZE,
1819 .type = CRYPTO_ALG_TYPE_AEAD,
1817 .template_aead = { 1820 .template_aead = {
1818 .setkey = aead_setkey, 1821 .setkey = aead_setkey,
1819 .setauthsize = aead_setauthsize, 1822 .setauthsize = aead_setauthsize,
@@ -1853,6 +1856,7 @@ static struct caam_alg_template driver_algs[] = {
1853 .name = "authenc(hmac(sha384),cbc(des3_ede))", 1856 .name = "authenc(hmac(sha384),cbc(des3_ede))",
1854 .driver_name = "authenc-hmac-sha384-cbc-des3_ede-caam", 1857 .driver_name = "authenc-hmac-sha384-cbc-des3_ede-caam",
1855 .blocksize = DES3_EDE_BLOCK_SIZE, 1858 .blocksize = DES3_EDE_BLOCK_SIZE,
1859 .type = CRYPTO_ALG_TYPE_AEAD,
1856 .template_aead = { 1860 .template_aead = {
1857 .setkey = aead_setkey, 1861 .setkey = aead_setkey,
1858 .setauthsize = aead_setauthsize, 1862 .setauthsize = aead_setauthsize,
@@ -1930,6 +1934,7 @@ static struct caam_alg_template driver_algs[] = {
1930 .name = "authenc(hmac(sha224),cbc(des))", 1934 .name = "authenc(hmac(sha224),cbc(des))",
1931 .driver_name = "authenc-hmac-sha224-cbc-des-caam", 1935 .driver_name = "authenc-hmac-sha224-cbc-des-caam",
1932 .blocksize = DES_BLOCK_SIZE, 1936 .blocksize = DES_BLOCK_SIZE,
1937 .type = CRYPTO_ALG_TYPE_AEAD,
1933 .template_aead = { 1938 .template_aead = {
1934 .setkey = aead_setkey, 1939 .setkey = aead_setkey,
1935 .setauthsize = aead_setauthsize, 1940 .setauthsize = aead_setauthsize,
@@ -1969,6 +1974,7 @@ static struct caam_alg_template driver_algs[] = {
1969 .name = "authenc(hmac(sha384),cbc(des))", 1974 .name = "authenc(hmac(sha384),cbc(des))",
1970 .driver_name = "authenc-hmac-sha384-cbc-des-caam", 1975 .driver_name = "authenc-hmac-sha384-cbc-des-caam",
1971 .blocksize = DES_BLOCK_SIZE, 1976 .blocksize = DES_BLOCK_SIZE,
1977 .type = CRYPTO_ALG_TYPE_AEAD,
1972 .template_aead = { 1978 .template_aead = {
1973 .setkey = aead_setkey, 1979 .setkey = aead_setkey,
1974 .setauthsize = aead_setauthsize, 1980 .setauthsize = aead_setauthsize,