From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 18 Nov 2015 10:31:14 +0000 (+0100)
Subject: android: Propose ChaCha20/Poly1305 in the ESP AEAD proposals
X-Git-Tag: 5.5.2dr3~12^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0913fc1e745b254a03ead0018aea2557fd6daa;p=thirdparty%2Fstrongswan.git

android: Propose ChaCha20/Poly1305 in the ESP AEAD proposals
---

diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
index 2532402bbf..87e9342153 100644
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
@@ -789,7 +789,8 @@ static job_requeue_t initiate(private_android_service_t *this)
 	/* create ESP proposals with and without DH groups, let responder decide
 	 * if PFS is used */
 	child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,
-							"aes128gcm16-aes256gcm16-ecp256"));
+							"aes128gcm16-aes256gcm16-chacha20poly1305-"
+							"ecp256-modp3072"));
 	child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,
 							"aes128-sha256-ecp256-modp3072"));
 	child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,
@@ -799,7 +800,7 @@ static job_requeue_t initiate(private_android_service_t *this)
 							"ecp256-ecp384-ecp521-"
 							"modp2048-modp3072-modp4096-modp1024"));
 	child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,
-							"aes128gcm16-aes256gcm16"));
+							"aes128gcm16-aes256gcm16-chacha20poly1305"));
 	child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,
 							"aes128-sha256"));
 	child_cfg->add_proposal(child_cfg, proposal_create_from_string(PROTO_ESP,