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

Commit 4db4ad26 authored by Martin Willi's avatar Martin Willi Committed by Herbert Xu
Browse files

crypto: chacha20poly1305 - Add an IPsec variant for RFC7539 AEAD 



draft-ietf-ipsecme-chacha20-poly1305 defines the use of ChaCha20/Poly1305 in
ESP. It uses additional four byte key material as a salt, which is then used
with an 8 byte IV to form the ChaCha20 nonce as defined in the RFC7539.

Signed-off-by: default avatarMartin Willi <martin@strongswan.org>
Acked-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent af2b76b5

crypto/chacha20poly1305.c

+25 −1
Original line number Diff line number Diff line
@@ -627,6 +627,11 @@ static struct crypto_instance *rfc7539_alloc(struct rtattr **tb) 
	return chachapoly_alloc(tb, "rfc7539", 12);

}



static struct crypto_instance *rfc7539esp_alloc(struct rtattr **tb)

{

	return chachapoly_alloc(tb, "rfc7539esp", 8);

}



static void chachapoly_free(struct crypto_instance *inst)

{

	struct chachapoly_instance_ctx *ctx = crypto_instance_ctx(inst);
@@ -643,13 +648,31 @@ static struct crypto_template rfc7539_tmpl = { 
	.module = THIS_MODULE,

};



static struct crypto_template rfc7539esp_tmpl = {

	.name = "rfc7539esp",

	.alloc = rfc7539esp_alloc,

	.free = chachapoly_free,

	.module = THIS_MODULE,

};



static int __init chacha20poly1305_module_init(void)

{

	return crypto_register_template(&rfc7539_tmpl);

	int err;



	err = crypto_register_template(&rfc7539_tmpl);

	if (err)

		return err;



	err = crypto_register_template(&rfc7539esp_tmpl);

	if (err)

		crypto_unregister_template(&rfc7539_tmpl);



	return err;

}



static void __exit chacha20poly1305_module_exit(void)

{

	crypto_unregister_template(&rfc7539esp_tmpl);

	crypto_unregister_template(&rfc7539_tmpl);

}
@@ -661,3 +684,4 @@ MODULE_AUTHOR("Martin Willi <martin@strongswan.org>"); 
MODULE_DESCRIPTION("ChaCha20-Poly1305 AEAD");

MODULE_ALIAS_CRYPTO("chacha20poly1305");

MODULE_ALIAS_CRYPTO("rfc7539");

MODULE_ALIAS_CRYPTO("rfc7539esp");