From f5e8bc18fda03b8d0baf2b54883ddb18f6059807 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 1 Jun 2016 14:53:23 +0200
Subject: [PATCH] proposal: Remove MODP_NONE from IKE proposals parsed from
 strings

---
 src/libcharon/config/proposal.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c
index d676dec08..a83acec23 100644
--- a/src/libcharon/config/proposal.c
+++ b/src/libcharon/config/proposal.c
@@ -453,6 +453,16 @@ static void check_proposal(private_proposal_t *this)
 			}
 		}
 		e->destroy(e);
+		/* remove MODP_NONE from IKE proposal */
+		e = array_create_enumerator(this->transforms);
+		while (e->enumerate(e, &entry))
+		{
+			if (entry->type == DIFFIE_HELLMAN_GROUP && !entry->alg)
+			{
+				array_remove_at(this->transforms, e);
+			}
+		}
+		e->destroy(e);
 	}
 
 	if (this->protocol == PROTO_ESP)