Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b4d43a4 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: caam - add support for MD5 algorithm variants 



specifically, add these algorithm combinations:

authenc-hmac-md5-cbc-aes-caam
authenc-hmac-md5-cbc-des3_ede-caam
authenc-hmac-md5-cbc-des-caam

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c3e337f8

drivers/crypto/caam/caamalg.c

+57 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,25 @@ struct caam_alg_template { 


static struct caam_alg_template driver_algs[] = {

	/* single-pass ipsec_esp descriptor */

	{

		.name = "authenc(hmac(md5),cbc(aes))",

		.driver_name = "authenc-hmac-md5-cbc-aes-caam",

		.blocksize = AES_BLOCK_SIZE,

		.type = CRYPTO_ALG_TYPE_AEAD,

		.template_aead = {

			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_decrypt,

			.givencrypt = aead_givencrypt,

			.geniv = "<built-in>",

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

			},

		.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,

		.class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP,

		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,

	},

	{

		.name = "authenc(hmac(sha1),cbc(aes))",

		.driver_name = "authenc-hmac-sha1-cbc-aes-caam",
@@ -1864,6 +1883,25 @@ static struct caam_alg_template driver_algs[] = { 
				   OP_ALG_AAI_HMAC_PRECOMP,

		.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,

	},

	{

		.name = "authenc(hmac(md5),cbc(des3_ede))",

		.driver_name = "authenc-hmac-md5-cbc-des3_ede-caam",

		.blocksize = DES3_EDE_BLOCK_SIZE,

		.type = CRYPTO_ALG_TYPE_AEAD,

		.template_aead = {

			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_decrypt,

			.givencrypt = aead_givencrypt,

			.geniv = "<built-in>",

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

			},

		.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,

		.class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP,

		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,

	},

	{

		.name = "authenc(hmac(sha1),cbc(des3_ede))",

		.driver_name = "authenc-hmac-sha1-cbc-des3_ede-caam",
@@ -1923,6 +1961,25 @@ static struct caam_alg_template driver_algs[] = { 
				   OP_ALG_AAI_HMAC_PRECOMP,

		.alg_op = OP_ALG_ALGSEL_SHA512 | OP_ALG_AAI_HMAC,

	},

	{

		.name = "authenc(hmac(md5),cbc(des))",

		.driver_name = "authenc-hmac-md5-cbc-des-caam",

		.blocksize = DES_BLOCK_SIZE,

		.type = CRYPTO_ALG_TYPE_AEAD,

		.template_aead = {

			.setkey = aead_setkey,

			.setauthsize = aead_setauthsize,

			.encrypt = aead_encrypt,

			.decrypt = aead_decrypt,

			.givencrypt = aead_givencrypt,

			.geniv = "<built-in>",

			.ivsize = DES_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

			},

		.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,

		.class2_alg_type = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC_PRECOMP,

		.alg_op = OP_ALG_ALGSEL_MD5 | OP_ALG_AAI_HMAC,

	},

	{

		.name = "authenc(hmac(sha1),cbc(des))",

		.driver_name = "authenc-hmac-sha1-cbc-des-caam",

drivers/crypto/caam/compat.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <crypto/aes.h>

#include <crypto/des.h>

#include <crypto/sha.h>

#include <crypto/md5.h>

#include <crypto/aead.h>

#include <crypto/authenc.h>

#include <crypto/scatterwalk.h>