]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
child-cfg: Strip QSKE mechanisms from ESP proposal when we strip DH groups
authorTobias Brunner <tobias@strongswan.org>
Mon, 9 Jul 2018 14:59:05 +0000 (16:59 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 14 May 2019 08:54:45 +0000 (10:54 +0200)
src/libcharon/config/child_cfg.c

index 1e3d2e1dff81255f04938a4c4ac4f1e959ed9397..6d8f197c4d49b69d96f9a69b72a36271b229715b 100644 (file)
@@ -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);