Linux cryptographic layer development
 help / color / mirror / Atom feed
From: "Paul Louvel" <paul.louvel@bootlin.com>
To: "Christophe Leroy (CS GROUP)" <chleroy@kernel.org>,
	"Paul Louvel" <paul.louvel@bootlin.com>,
	"Herbert Xu" <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>
Cc: "Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
	"Herve Codina" <herve.codina@bootlin.com>,
	<linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 17/29] crypto: talitos/aead - Use macro for algorithm definitions
Date: Wed, 10 Jun 2026 16:41:44 +0200	[thread overview]
Message-ID: <DJ5G56ORGABQ.1GWJJ7M7UR0V@bootlin.com> (raw)
In-Reply-To: <30919934-0baf-47c3-a601-3ff0c8cc7f43@kernel.org>

Hi Christophe,

On Mon Jun 1, 2026 at 2:12 PM CEST, Christophe Leroy (CS GROUP) wrote:
>
>
> Le 28/05/2026 à 11:08, Paul Louvel a écrit :
>> Replace the repetitive struct initializer entries in aead_driver_algs[]
>> with preprocessor macros (TALITOS_AEAD_ALG, TALITOS_AEAD_ALG_HSNA).
>> 
>> Move the function pointer assignments (init, exit, encrypt, decrypt)
>> from the registration loop into the static initializer, since they are
>> identical for all algorithms.
>> 
>> The fallback setkey assignment (aead_alg->setkey ?: aead_setkey) is
>> replaced by specifying the correct setkey handler directly in each macro
>> invocation.
>> 
>> Signed-off-by: Paul Louvel <paul.louvel@bootlin.com>
>
> Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
>
> Wondering if we could go even more far with the COMMON flags, as for 
> instance all TALITOS_AEAD_ALG_HSNA have DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU 
> while TALITOS_AEAD_ALG have DESC_HDR_TYPE_IPSEC_ESP
>

I tried going as far as possible, but it make a mess of macros. Even if there is
repetition here (there is outside your example) for the template, I think this
is better if this is kept as is.

>> ---
>>   drivers/crypto/talitos/talitos-aead.c | 751 ++++++++++------------------------
>>   1 file changed, 218 insertions(+), 533 deletions(-)
>> 
>> diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos/talitos-aead.c
>> index 38df616c9b22..cd1b8e6d371b 100644
>> --- a/drivers/crypto/talitos/talitos-aead.c
>> +++ b/drivers/crypto/talitos/talitos-aead.c
>> @@ -405,535 +405,225 @@ static void talitos_cra_exit_aead(struct crypto_aead *tfm)
>>   	talitos_cra_exit(crypto_aead_tfm(tfm));
>>   }
>>   
>> +#define TALITOS_AEAD_ALG_COMMON(name, name_prefix, set_key, block_size, \
>> +				max_auth_size, template, priority)      \
>> +	{ \
>> +		.type = CRYPTO_ALG_TYPE_AEAD, \
>> +		.alg.aead = { \
>> +			.base = { \
>> +				.cra_name = name, \
>> +				.cra_driver_name = name"-talitos"name_prefix, \
>> +				.cra_blocksize = block_size, \
>> +				.cra_flags = CRYPTO_ALG_ASYNC | \
>> +					     CRYPTO_ALG_ALLOCATES_MEMORY | \
>> +					     CRYPTO_ALG_KERN_DRIVER_ONLY, \
>> +				.cra_priority = (priority), \
>> +				.cra_ctxsize = sizeof(struct talitos_ctx), \
>> +				.cra_module = THIS_MODULE, \
>> +			}, \
>> +			.ivsize = block_size, \
>> +			.maxauthsize = max_auth_size, \
>> +			.setkey = set_key, \
>> +			.init = talitos_cra_init_aead, \
>> +			.exit = talitos_cra_exit_aead, \
>> +			.encrypt = aead_encrypt, \
>> +			.decrypt = aead_decrypt, \
>> +		}, \
>> +		.desc_hdr_template = template, \
>> +	}
>> +
>> +#define TALITOS_AEAD_ALG(name, set_key, block_size, max_auth_size, template)  \
>> +	TALITOS_AEAD_ALG_COMMON(name, "", set_key, block_size, max_auth_size, \
>> +				template, TALITOS_CRA_PRIORITY)
>> +
>> +#define TALITOS_AEAD_ALG_HSNA(name, set_key, block_size, max_auth_size, \
>> +			      template)                                 \
>> +	TALITOS_AEAD_ALG_COMMON(name, "-hsna", set_key, block_size,     \
>> +				max_auth_size, template,                \
>> +				TALITOS_CRA_PRIORITY_AEAD_HSNA)
>> +
>>   static struct talitos_alg_template aead_driver_algs[] = {
>> -	{	.type = CRYPTO_ALG_TYPE_AEAD,
>> -		.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = AES_BLOCK_SIZE,
>> -			.maxauthsize = SHA1_DIGEST_SIZE,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(sha1),cbc(aes))",
>> -				.cra_driver_name = "authenc-hmac-sha1-"
>> -						   "cbc-aes-talitos-hsna",
>> -				.cra_blocksize = AES_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.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 = {
>> -				.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA1_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(sha1),"
>> -					    "cbc(des3_ede))",
>> -				.cra_driver_name = "authenc-hmac-sha1-"
>> -						   "cbc-3des-talitos-hsna",
>> -				.cra_blocksize = DES3_EDE_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA1_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.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 = {
>> -				.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = AES_BLOCK_SIZE,
>> -			.maxauthsize = SHA224_DIGEST_SIZE,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(sha224),cbc(aes))",
>> -				.cra_driver_name = "authenc-hmac-sha224-"
>> -						   "cbc-aes-talitos-hsna",
>> -				.cra_blocksize = AES_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.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 = {
>> -				.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA224_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(sha224),"
>> -					    "cbc(des3_ede))",
>> -				.cra_driver_name = "authenc-hmac-sha224-"
>> -						   "cbc-3des-talitos-hsna",
>> -				.cra_blocksize = DES3_EDE_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA224_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.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 = {
>> -				.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = AES_BLOCK_SIZE,
>> -			.maxauthsize = SHA256_DIGEST_SIZE,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(sha256),cbc(aes))",
>> -				.cra_driver_name = "authenc-hmac-sha256-"
>> -						   "cbc-aes-talitos-hsna",
>> -				.cra_blocksize = AES_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.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 = {
>> -				.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA256_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(sha256),"
>> -					    "cbc(des3_ede))",
>> -				.cra_driver_name = "authenc-hmac-sha256-"
>> -						   "cbc-3des-talitos-hsna",
>> -				.cra_blocksize = DES3_EDE_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA256_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.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 = {
>> -				.cra_name = "authenc(hmac(sha384),cbc(aes))",
>> -				.cra_driver_name = "authenc-hmac-sha384-"
>> -						   "cbc-aes-talitos",
>> -				.cra_blocksize = AES_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = AES_BLOCK_SIZE,
>> -			.maxauthsize = SHA384_DIGEST_SIZE,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     DESC_HDR_SEL0_AESU |
>> -				     DESC_HDR_MODE0_AESU_CBC |
>> -				     DESC_HDR_SEL1_MDEUB |
>> -				     DESC_HDR_MODE1_MDEU_INIT |
>> -				     DESC_HDR_MODE1_MDEU_PAD |
>> -				     DESC_HDR_MODE1_MDEUB_SHA384_HMAC,
>> -	},
>> -	{	.type = CRYPTO_ALG_TYPE_AEAD,
>> -		.alg.aead = {
>> -			.base = {
>> -				.cra_name = "authenc(hmac(sha384),"
>> -					    "cbc(des3_ede))",
>> -				.cra_driver_name = "authenc-hmac-sha384-"
>> -						   "cbc-3des-talitos",
>> -				.cra_blocksize = DES3_EDE_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA384_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     DESC_HDR_SEL0_DEU |
>> -				     DESC_HDR_MODE0_DEU_CBC |
>> -				     DESC_HDR_MODE0_DEU_3DES |
>> -				     DESC_HDR_SEL1_MDEUB |
>> -				     DESC_HDR_MODE1_MDEU_INIT |
>> -				     DESC_HDR_MODE1_MDEU_PAD |
>> -				     DESC_HDR_MODE1_MDEUB_SHA384_HMAC,
>> -	},
>> -	{	.type = CRYPTO_ALG_TYPE_AEAD,
>> -		.alg.aead = {
>> -			.base = {
>> -				.cra_name = "authenc(hmac(sha512),cbc(aes))",
>> -				.cra_driver_name = "authenc-hmac-sha512-"
>> -						   "cbc-aes-talitos",
>> -				.cra_blocksize = AES_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = AES_BLOCK_SIZE,
>> -			.maxauthsize = SHA512_DIGEST_SIZE,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     DESC_HDR_SEL0_AESU |
>> -				     DESC_HDR_MODE0_AESU_CBC |
>> -				     DESC_HDR_SEL1_MDEUB |
>> -				     DESC_HDR_MODE1_MDEU_INIT |
>> -				     DESC_HDR_MODE1_MDEU_PAD |
>> -				     DESC_HDR_MODE1_MDEUB_SHA512_HMAC,
>> -	},
>> -	{	.type = CRYPTO_ALG_TYPE_AEAD,
>> -		.alg.aead = {
>> -			.base = {
>> -				.cra_name = "authenc(hmac(sha512),"
>> -					    "cbc(des3_ede))",
>> -				.cra_driver_name = "authenc-hmac-sha512-"
>> -						   "cbc-3des-talitos",
>> -				.cra_blocksize = DES3_EDE_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = SHA512_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     DESC_HDR_SEL0_DEU |
>> -				     DESC_HDR_MODE0_DEU_CBC |
>> -				     DESC_HDR_MODE0_DEU_3DES |
>> -				     DESC_HDR_SEL1_MDEUB |
>> -				     DESC_HDR_MODE1_MDEU_INIT |
>> -				     DESC_HDR_MODE1_MDEU_PAD |
>> -				     DESC_HDR_MODE1_MDEUB_SHA512_HMAC,
>> -	},
>> -	{	.type = CRYPTO_ALG_TYPE_AEAD,
>> -		.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = AES_BLOCK_SIZE,
>> -			.maxauthsize = MD5_DIGEST_SIZE,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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 = {
>> -				.cra_name = "authenc(hmac(md5),cbc(aes))",
>> -				.cra_driver_name = "authenc-hmac-md5-"
>> -						   "cbc-aes-talitos-hsna",
>> -				.cra_blocksize = AES_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.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 = {
>> -				.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 |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = MD5_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
>> -				     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,
>> -	},
>> -	{	.type = CRYPTO_ALG_TYPE_AEAD,
>> -		.alg.aead = {
>> -			.base = {
>> -				.cra_name = "authenc(hmac(md5),cbc(des3_ede))",
>> -				.cra_driver_name = "authenc-hmac-md5-"
>> -						   "cbc-3des-talitos-hsna",
>> -				.cra_blocksize = DES3_EDE_BLOCK_SIZE,
>> -				.cra_flags = CRYPTO_ALG_ASYNC |
>> -					     CRYPTO_ALG_ALLOCATES_MEMORY |
>> -					     CRYPTO_ALG_KERN_DRIVER_ONLY,
>> -				.cra_priority = TALITOS_CRA_PRIORITY_AEAD_HSNA,
>> -				.cra_ctxsize = sizeof(struct talitos_ctx),
>> -				.cra_module = THIS_MODULE,
>> -			},
>> -			.ivsize = DES3_EDE_BLOCK_SIZE,
>> -			.maxauthsize = MD5_DIGEST_SIZE,
>> -			.setkey = aead_des3_setkey,
>> -		},
>> -		.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,
>> -	},
>> +	/* AEAD algorithms.  These use a single-pass ipsec_esp descriptor */
>> +
>> +	/* sha1 auth */
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(sha1),cbc(aes))", aead_setkey,
>> +			 AES_BLOCK_SIZE, SHA1_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(sha1),cbc(aes))", aead_setkey, AES_BLOCK_SIZE,
>> +		SHA1_DIGEST_SIZE,
>> +		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),
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(sha1),cbc(des3_ede))", aead_des3_setkey,
>> +			 DES3_EDE_BLOCK_SIZE, SHA1_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(sha1),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA1_DIGEST_SIZE,
>> +		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),
>> +
>> +	/* sha224 auth */
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(sha224),cbc(aes))", aead_setkey,
>> +			 AES_BLOCK_SIZE, SHA224_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(sha224),cbc(aes))", aead_setkey, AES_BLOCK_SIZE,
>> +		SHA224_DIGEST_SIZE,
>> +		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),
>> +
>> +	TALITOS_AEAD_ALG(
>> +		"authenc(hmac(sha224),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA224_DIGEST_SIZE,
>> +		DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(sha224),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA224_DIGEST_SIZE,
>> +		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),
>> +
>> +	/* sha256 auth */
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(sha256),cbc(aes))", aead_setkey,
>> +			 AES_BLOCK_SIZE, SHA256_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(sha256),cbc(aes))", aead_setkey, AES_BLOCK_SIZE,
>> +		SHA256_DIGEST_SIZE,
>> +		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),
>> +
>> +	TALITOS_AEAD_ALG(
>> +		"authenc(hmac(sha256),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA256_DIGEST_SIZE,
>> +		DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(sha256),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA256_DIGEST_SIZE,
>> +		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),
>> +
>> +	/* sha384 auth */
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(sha384),cbc(aes))", aead_setkey,
>> +			 AES_BLOCK_SIZE, SHA384_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU |
>> +				 DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUB |
>> +				 DESC_HDR_MODE1_MDEU_INIT |
>> +				 DESC_HDR_MODE1_MDEU_PAD |
>> +				 DESC_HDR_MODE1_MDEUB_SHA384_HMAC),
>> +
>> +	TALITOS_AEAD_ALG(
>> +		"authenc(hmac(sha384),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA384_DIGEST_SIZE,
>> +		DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU |
>> +			DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES |
>> +			DESC_HDR_SEL1_MDEUB | DESC_HDR_MODE1_MDEU_INIT |
>> +			DESC_HDR_MODE1_MDEU_PAD |
>> +			DESC_HDR_MODE1_MDEUB_SHA384_HMAC),
>> +
>> +	/* sha512 auth */
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(sha512),cbc(aes))", aead_setkey,
>> +			 AES_BLOCK_SIZE, SHA512_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU |
>> +				 DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUB |
>> +				 DESC_HDR_MODE1_MDEU_INIT |
>> +				 DESC_HDR_MODE1_MDEU_PAD |
>> +				 DESC_HDR_MODE1_MDEUB_SHA512_HMAC),
>> +
>> +	TALITOS_AEAD_ALG(
>> +		"authenc(hmac(sha512),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, SHA512_DIGEST_SIZE,
>> +		DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU |
>> +			DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES |
>> +			DESC_HDR_SEL1_MDEUB | DESC_HDR_MODE1_MDEU_INIT |
>> +			DESC_HDR_MODE1_MDEU_PAD |
>> +			DESC_HDR_MODE1_MDEUB_SHA512_HMAC),
>> +
>> +	/* md5 auth */
>> +
>> +	TALITOS_AEAD_ALG("authenc(hmac(md5),cbc(aes))", aead_setkey,
>> +			 AES_BLOCK_SIZE, MD5_DIGEST_SIZE,
>> +			 DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(md5),cbc(aes))", aead_setkey, AES_BLOCK_SIZE,
>> +		MD5_DIGEST_SIZE,
>> +		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),
>> +
>> +	TALITOS_AEAD_ALG(
>> +		"authenc(hmac(md5),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, MD5_DIGEST_SIZE,
>> +		DESC_HDR_TYPE_IPSEC_ESP | 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),
>> +
>> +	TALITOS_AEAD_ALG_HSNA(
>> +		"authenc(hmac(md5),cbc(des3_ede))", aead_des3_setkey,
>> +		DES3_EDE_BLOCK_SIZE, MD5_DIGEST_SIZE,
>> +		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),
>>   };
>>   
>>   int talitos_register_aead(struct device *dev)
>> @@ -955,11 +645,6 @@ int talitos_register_aead(struct device *dev)
>>   		if (has_ftr_sec1(priv))
>>   			alg->cra_alignmask = 3;
>>   
>> -		aead_alg->init = talitos_cra_init_aead;
>> -		aead_alg->exit = talitos_cra_exit_aead;
>> -		aead_alg->setkey = aead_alg->setkey ?: aead_setkey;
>> -		aead_alg->encrypt = aead_encrypt;
>> -		aead_alg->decrypt = aead_decrypt;
>>   		if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) &&
>>   		    !strncmp(alg->cra_name, "authenc(hmac(sha224)", 20)) {
>>   			continue;
>> 

Thanks,



-- 
Paul Louvel, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


  reply	other threads:[~2026-06-10 14:41 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-28  9:08 [PATCH 00/29] crypto: talitos - Driver cleanup Paul Louvel
2026-05-28  9:08 ` [PATCH 01/29] crypto: talitos/hash - Use CRYPTO_AHASH_BLOCK_ONLY API Paul Louvel
2026-05-29 11:25   ` Christophe Leroy (CS GROUP)
2026-06-01  5:40   ` Christophe Leroy (CS GROUP)
2026-06-01  8:06     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 02/29] crypto: talitos - Move driver into dedicated directory Paul Louvel
2026-05-29 11:25   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 03/29] crypto: talitos - Add missing includes to driver header file Paul Louvel
2026-05-29 11:26   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 04/29] crypto: talitos/hwrng - Move into separate file Paul Louvel
2026-05-29 11:26   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 05/29] crypto: talitos - Prepare crypto implementation file splitting Paul Louvel
2026-05-29 13:21   ` Christophe Leroy (CS GROUP)
2026-05-29 16:24     ` David Laight
2026-06-01  8:49     ` Paul Louvel
2026-06-01 10:16       ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 06/29] crypto: talitos - Introduce registration helper Paul Louvel
2026-06-01  5:45   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 07/29] crypto: talitos/hash - Move into separate file Paul Louvel
2026-06-01 11:47   ` Christophe Leroy (CS GROUP)
2026-06-04 12:31     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 08/29] crypto: talitos/skcipher " Paul Louvel
2026-06-01 11:47   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 09/29] crypto: talitos/aead " Paul Louvel
2026-06-01 11:48   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 10/29] crypto: talitos - Remove alg settings in talitos_register_common() Paul Louvel
2026-06-01 11:53   ` Christophe Leroy (CS GROUP)
2026-06-04 12:38     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 11/29] crypto: talitos - Remove unused priority field in struct talitos_alg_template Paul Louvel
2026-06-01 11:54   ` Christophe Leroy (CS GROUP)
2026-06-04 12:39     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 12/29] crypto: talitos/hash - Convert to init_tfm/exit_tfm type-specific API Paul Louvel
2026-06-01 11:57   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 13/29] crypto: talitos/skcipher - Convert to init/exit " Paul Louvel
2026-06-01 11:58   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 14/29] crypto: talitos/aead " Paul Louvel
2026-06-01 11:59   ` Christophe Leroy (CS GROUP)
2026-06-04 12:44     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 15/29] crypto: talitos/hash - Use macro for algorithm definitions Paul Louvel
2026-06-01 12:02   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 16/29] crypto: talitos/skcipher " Paul Louvel
2026-06-01 12:02   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 17/29] crypto: talitos/aead " Paul Louvel
2026-06-01 12:12   ` Christophe Leroy (CS GROUP)
2026-06-10 14:41     ` Paul Louvel [this message]
2026-05-28  9:08 ` [PATCH 18/29] crypto: talitos - Split SEC1/SEC2 code into separate function variants Paul Louvel
2026-06-01  5:51   ` Christophe Leroy (CS GROUP)
2026-06-01 12:32   ` Christophe Leroy (CS GROUP)
2026-06-04 12:46     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 19/29] crypto: talitos - Introduce struct talitos_ops Paul Louvel
2026-05-28  9:08 ` [PATCH 20/29] crypto: talitos - Replace SEC1/SEC2 conditionals with ops dispatch Paul Louvel
2026-06-04  9:37   ` Christophe Leroy (CS GROUP)
2026-06-04 13:05     ` Paul Louvel
2026-06-04 15:26       ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 21/29] crypto: talitos - Export common channel and error handling routines Paul Louvel
2026-05-28  9:08 ` [PATCH 22/29] crypto: talitos - Move SEC1 ops into talitos-sec1.c Paul Louvel
2026-05-28  9:08 ` [PATCH 23/29] crypto: talitos - Move SEC2 ops into talitos-sec2.c Paul Louvel
2026-05-28  9:08 ` [PATCH 24/29] crypto: talitos - Introduce per-SEC-version pointer helper ops Paul Louvel
2026-06-04  9:48   ` Christophe Leroy (CS GROUP)
2026-05-28  9:08 ` [PATCH 25/29] crypto: talitos - Dispatch pointer helpers through ptr_ops Paul Louvel
2026-05-28  9:08 ` [PATCH 26/29] crypto: talitos - Remove now-unused global pointer helpers Paul Louvel
2026-05-28  9:08 ` [PATCH 27/29] crypto: talitos - Introduce per-SEC-version descriptor structures and ops Paul Louvel
2026-06-04  9:57   ` Christophe Leroy (CS GROUP)
2026-06-04 13:01     ` Paul Louvel
2026-05-28  9:08 ` [PATCH 28/29] crypto: talitos - Clean up includes in core driver file Paul Louvel
2026-05-28  9:08 ` [PATCH 29/29] crypto: talitos - Remove TALITOS_DESC_SIZE macro Paul Louvel
2026-06-04  9:59   ` Christophe Leroy (CS GROUP)
2026-06-04 13:01     ` Paul Louvel
2026-06-01  6:15 ` [PATCH 00/29] crypto: talitos - Driver cleanup Christophe Leroy (CS GROUP)
2026-06-01  9:17   ` Paul Louvel
2026-06-01 10:27     ` Christophe Leroy (CS GROUP)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DJ5G56ORGABQ.1GWJJ7M7UR0V@bootlin.com \
    --to=paul.louvel@bootlin.com \
    --cc=chleroy@kernel.org \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=herve.codina@bootlin.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox