Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / drivers / crypto / caam / caamalg.c

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index cf268b1..765fdf5 100644 (file)
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1693,6 +1693,7 @@ static struct caam_alg_template driver_algs[] = {
                .name = "authenc(hmac(sha224),cbc(aes))",
                .driver_name = "authenc-hmac-sha224-cbc-aes-caam",
                .blocksize = AES_BLOCK_SIZE,
+               .type = CRYPTO_ALG_TYPE_AEAD,
                .template_aead = {
                        .setkey = aead_setkey,
                        .setauthsize = aead_setauthsize,
@@ -1732,6 +1733,7 @@ static struct caam_alg_template driver_algs[] = {
                .name = "authenc(hmac(sha384),cbc(aes))",
                .driver_name = "authenc-hmac-sha384-cbc-aes-caam",
                .blocksize = AES_BLOCK_SIZE,
+               .type = CRYPTO_ALG_TYPE_AEAD,
                .template_aead = {
                        .setkey = aead_setkey,
                        .setauthsize = aead_setauthsize,
@@ -1810,6 +1812,7 @@ static struct caam_alg_template driver_algs[] = {
                .name = "authenc(hmac(sha224),cbc(des3_ede))",
                .driver_name = "authenc-hmac-sha224-cbc-des3_ede-caam",
                .blocksize = DES3_EDE_BLOCK_SIZE,
+               .type = CRYPTO_ALG_TYPE_AEAD,
                .template_aead = {
                        .setkey = aead_setkey,
                        .setauthsize = aead_setauthsize,
@@ -1849,6 +1852,7 @@ static struct caam_alg_template driver_algs[] = {
                .name = "authenc(hmac(sha384),cbc(des3_ede))",
                .driver_name = "authenc-hmac-sha384-cbc-des3_ede-caam",
                .blocksize = DES3_EDE_BLOCK_SIZE,
+               .type = CRYPTO_ALG_TYPE_AEAD,
                .template_aead = {
                        .setkey = aead_setkey,
                        .setauthsize = aead_setauthsize,
@@ -1926,6 +1930,7 @@ static struct caam_alg_template driver_algs[] = {
                .name = "authenc(hmac(sha224),cbc(des))",
                .driver_name = "authenc-hmac-sha224-cbc-des-caam",
                .blocksize = DES_BLOCK_SIZE,
+               .type = CRYPTO_ALG_TYPE_AEAD,
                .template_aead = {
                        .setkey = aead_setkey,
                        .setauthsize = aead_setauthsize,
@@ -1965,6 +1970,7 @@ static struct caam_alg_template driver_algs[] = {
                .name = "authenc(hmac(sha384),cbc(des))",
                .driver_name = "authenc-hmac-sha384-cbc-des-caam",
                .blocksize = DES_BLOCK_SIZE,
+               .type = CRYPTO_ALG_TYPE_AEAD,
                .template_aead = {
                        .setkey = aead_setkey,
                        .setauthsize = aead_setauthsize,