From 5f0913fc1e745b254a03ead0018aea2557fd6daa Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 18 Nov 2015 11:31:14 +0100 Subject: [PATCH] android: Propose ChaCha20/Poly1305 in the ESP AEAD proposals --- .../src/main/jni/libandroidbridge/backend/android_service.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 2532402bb..87e934215 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,