From bbcb76e26043e359ec935ba4f124350639f673c2 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Sun, 5 Apr 2015 14:29:29 +0200
Subject: [PATCH] ikev2: Use four byte salt for ChaCha20-Poly1305 AEAD

---
 src/libcharon/sa/ikev2/keymat_v2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libcharon/sa/ikev2/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
index 6fedc8eb5..b57306b66 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: