Commit 7405c8d7 authored by LEROY Christophe's avatar LEROY Christophe Committed by Herbert Xu
Browse files

crypto: talitos - templates for AEAD using HMAC_SNOOP_NO_AFEU 



This will allow IPSEC on SEC1

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b0057763

drivers/crypto/talitos.c

+180 −0
Original line number Diff line number Diff line
@@ -811,6 +811,11 @@ static void talitos_unregister_rng(struct device *dev) 
 * crypto alg

 */

#define TALITOS_CRA_PRIORITY		3000

/*

 * Defines a priority for doing AEAD with descriptors type

 * HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP

 */

#define TALITOS_CRA_PRIORITY_AEAD_HSNA	(TALITOS_CRA_PRIORITY - 1)

#define TALITOS_MAX_KEY_SIZE		96

#define TALITOS_MAX_IV_LENGTH		16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE */
@@ -2151,6 +2156,27 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_SHA1_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

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

				.cra_driver_name = "authenc-hmac-sha1-"

						   "cbc-aes-talitos",

				.cra_blocksize = AES_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA1_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_AESU |

				     DESC_HDR_MODE0_AESU_CBC |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA1_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2173,6 +2199,29 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_SHA1_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

				.cra_name = "authenc(hmac(sha1),"

					    "cbc(des3_ede))",

				.cra_driver_name = "authenc-hmac-sha1-"

						   "cbc-3des-talitos",

				.cra_blocksize = DES3_EDE_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA1_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_DEU |

				     DESC_HDR_MODE0_DEU_CBC |

				     DESC_HDR_MODE0_DEU_3DES |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA1_HMAC,

	},

	{       .type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2193,6 +2242,27 @@ static struct talitos_alg_template driver_algs[] = { 
				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA224_HMAC,

	},

	{       .type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

				.cra_name = "authenc(hmac(sha224),cbc(aes))",

				.cra_driver_name = "authenc-hmac-sha224-"

						   "cbc-aes-talitos",

				.cra_blocksize = AES_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA224_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_AESU |

				     DESC_HDR_MODE0_AESU_CBC |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA224_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2215,6 +2285,29 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_SHA224_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

				.cra_name = "authenc(hmac(sha224),"

					    "cbc(des3_ede))",

				.cra_driver_name = "authenc-hmac-sha224-"

						   "cbc-3des-talitos",

				.cra_blocksize = DES3_EDE_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA224_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_DEU |

				     DESC_HDR_MODE0_DEU_CBC |

				     DESC_HDR_MODE0_DEU_3DES |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA224_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2235,6 +2328,27 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_SHA256_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

				.cra_name = "authenc(hmac(sha256),cbc(aes))",

				.cra_driver_name = "authenc-hmac-sha256-"

						   "cbc-aes-talitos",

				.cra_blocksize = AES_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = SHA256_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_AESU |

				     DESC_HDR_MODE0_AESU_CBC |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA256_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2257,6 +2371,29 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_SHA256_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

				.cra_name = "authenc(hmac(sha256),"

					    "cbc(des3_ede))",

				.cra_driver_name = "authenc-hmac-sha256-"

						   "cbc-3des-talitos",

				.cra_blocksize = DES3_EDE_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = SHA256_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_DEU |

				     DESC_HDR_MODE0_DEU_CBC |

				     DESC_HDR_MODE0_DEU_3DES |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_SHA256_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2361,6 +2498,27 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_MD5_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

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

				.cra_driver_name = "authenc-hmac-md5-"

						   "cbc-aes-talitos",

				.cra_blocksize = AES_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = AES_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_AESU |

				     DESC_HDR_MODE0_AESU_CBC |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_MD5_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.alg.aead = {

			.base = {
@@ -2382,6 +2540,28 @@ static struct talitos_alg_template driver_algs[] = { 
		                     DESC_HDR_MODE1_MDEU_PAD |

		                     DESC_HDR_MODE1_MDEU_MD5_HMAC,

	},

	{	.type = CRYPTO_ALG_TYPE_AEAD,

		.priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,

		.alg.aead = {

			.base = {

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

				.cra_driver_name = "authenc-hmac-md5-"

						   "cbc-3des-talitos",

				.cra_blocksize = DES3_EDE_BLOCK_SIZE,

				.cra_flags = CRYPTO_ALG_ASYNC,

			},

			.ivsize = DES3_EDE_BLOCK_SIZE,

			.maxauthsize = MD5_DIGEST_SIZE,

		},

		.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |

				     DESC_HDR_SEL0_DEU |

				     DESC_HDR_MODE0_DEU_CBC |

				     DESC_HDR_MODE0_DEU_3DES |

				     DESC_HDR_SEL1_MDEUA |

				     DESC_HDR_MODE1_MDEU_INIT |

				     DESC_HDR_MODE1_MDEU_PAD |

				     DESC_HDR_MODE1_MDEU_MD5_HMAC,

	},

	/* ABLKCIPHER algorithms. */

	{	.type = CRYPTO_ALG_TYPE_ABLKCIPHER,

		.alg.crypto = {