From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 9 Jul 2018 14:59:05 +0000 (+0200)
Subject: child-cfg: Strip QSKE mechanisms from ESP proposal when we strip DH groups
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e7da935bbefef491c2f93fe03218f214063b4ef0;p=thirdparty%2Fstrongswan.git

child-cfg: Strip QSKE mechanisms from ESP proposal when we strip DH groups
---

diff --git a/src/libcharon/config/child_cfg.c b/src/libcharon/config/child_cfg.c
index 1e3d2e1dff..6d8f197c4d 100644
--- a/src/libcharon/config/child_cfg.c
+++ b/src/libcharon/config/child_cfg.c
@@ -218,6 +218,7 @@ METHOD(child_cfg_t, get_proposals, linked_list_t*,
 		if (strip_dh)
 		{
 			current->strip_transform(current, DIFFIE_HELLMAN_GROUP, MODP_NONE);
+			current->strip_transform(current, QSKE_MECHANISM, QSKE_NONE);
 		}
 		if (proposals->find_first(proposals, match_proposal, NULL, current))
 		{
@@ -257,6 +258,7 @@ METHOD(child_cfg_t, select_proposal, proposal_t*,
 		if (strip_dh)
 		{
 			proposal->strip_transform(proposal, DIFFIE_HELLMAN_GROUP, MODP_NONE);
+			proposal->strip_transform(proposal, QSKE_MECHANISM, QSKE_NONE);
 		}
 		if (prefer_self)
 		{
@@ -272,6 +274,7 @@ METHOD(child_cfg_t, select_proposal, proposal_t*,
 			if (strip_dh)
 			{
 				match->strip_transform(match, DIFFIE_HELLMAN_GROUP, MODP_NONE);
+				match->strip_transform(match, QSKE_MECHANISM, QSKE_NONE);
 			}
 			selected = proposal->select(proposal, match, prefer_self, private);
 			match->destroy(match);