From: Martin Willi <martin@revosec.ch>
Date: Sun, 5 Apr 2015 12:29:29 +0000 (+0200)
Subject: ikev2: Use four byte salt for ChaCha20-Poly1305 AEAD
X-Git-Tag: 5.3.3dr1~14^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcb76e26043e359ec935ba4f124350639f673c2;p=thirdparty%2Fstrongswan.git

ikev2: Use four byte salt for ChaCha20-Poly1305 AEAD
---

diff --git a/src/libcharon/sa/ikev2/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
index 6fedc8eb5b..b57306b66e 100644
--- a/src/libcharon/sa/ikev2/keymat_v2.c
+++ b/src/libcharon/sa/ikev2/keymat_v2.c
@@ -112,6 +112,7 @@ static bool derive_ike_aead(private_keymat_v2_t *this, u_int16_t alg,
 		case ENCR_AES_GCM_ICV12:
 		case ENCR_AES_GCM_ICV16:
 			/* RFC 4106 */
+		case ENCR_CHACHA20_POLY1305:
 			salt_size = 4;
 			break;
 		case ENCR_AES_CCM_ICV8: