From 5f7a69a23db8428dc6ca2ffddf29c85536181552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Tue, 27 Apr 2021 13:16:15 +0200 Subject: [PATCH] nhrp: Remove unused patches --- ...E_SA-limit-when-checking-out-by-conf.patch | 47 +- ...nal-source-and-remote-overrides-for-.patch | 48 +- ...-send-certificates-for-ike-sa-events.patch | 6 +- ...port-for-individual-sa-state-changes.patch | 6 +- ...-vici-add-deprecated-async-parameter.patch | 49 -- ...os-terminate-connections-source-dest.patch | 14 +- 0006-support-gre-key-in-ikev1.patch | 507 ------------------ strongswan.spec | 8 +- 8 files changed, 61 insertions(+), 624 deletions(-) delete mode 100644 0005-vici-add-deprecated-async-parameter.patch rename 0007-vyos-terminate-connections-source-dest.patch => 0005-vyos-terminate-connections-source-dest.patch (91%) delete mode 100644 0006-support-gre-key-in-ikev1.patch diff --git a/0001-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch b/0001-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch index e6f9b29..6873abc 100644 --- a/0001-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch +++ b/0001-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch @@ -1,13 +1,13 @@ -From 2ac05d5d77446a518d808a41ed628fbe66966335 Mon Sep 17 00:00:00 2001 +From ffc2fc151cf78204bd482340dee7c5e7d0c24e51 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 17 Jul 2015 11:53:58 +0200 -Subject: [PATCH 1/7] ike: Adhere to IKE_SA limit when checking out by config +Subject: [PATCH 1/5] ike: Adhere to IKE_SA limit when checking out by config This prevents new SAs from getting created if we hit the global IKE_SA limit (we still allow checkout_new(), which is used for rekeying). --- - src/libcharon/sa/ike_sa_manager.c | 73 ++++++++++++++++--------------- - 1 file changed, 38 insertions(+), 35 deletions(-) + src/libcharon/sa/ike_sa_manager.c | 71 ++++++++++++++++--------------- + 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c index f95ff19af..1e0ae42fe 100644 @@ -37,10 +37,25 @@ index f95ff19af..1e0ae42fe 100644 - if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING || - entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED) - { /* skip IKE_SAs which are not usable, wake other waiting threads */ +- entry->condvar->signal(entry->condvar); +- continue; +- } +- +- current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa); +- if (current_peer && current_peer->equals(current_peer, peer_cfg)) +- { +- current_ike = current_peer->get_ike_cfg(current_peer); +- if (current_ike->equals(current_ike, peer_cfg->get_ike_cfg(peer_cfg))) + if (!wait_for_entry(this, entry, segment)) -+ { + { +- entry->checked_out = thread_current(); +- ike_sa = entry->ike_sa; +- DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config", +- ike_sa->get_unique_id(ike_sa), +- current_peer->get_name(current_peer)); +- break; + continue; -+ } + } + if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING || + entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED) + { /* skip IKE_SAs which are not usable, wake other waiting threads */ @@ -63,24 +78,8 @@ index f95ff19af..1e0ae42fe 100644 + } + } + /* other threads might be waiting for this entry */ - entry->condvar->signal(entry->condvar); -- continue; ++ entry->condvar->signal(entry->condvar); } -- -- current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa); -- if (current_peer && current_peer->equals(current_peer, peer_cfg)) -- { -- current_ike = current_peer->get_ike_cfg(current_peer); -- if (current_ike->equals(current_ike, peer_cfg->get_ike_cfg(peer_cfg))) -- { -- entry->checked_out = thread_current(); -- ike_sa = entry->ike_sa; -- DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config", -- ike_sa->get_unique_id(ike_sa), -- current_peer->get_name(current_peer)); -- break; -- } -- } - /* other threads might be waiting for this entry */ - entry->condvar->signal(entry->condvar); + enumerator->destroy(enumerator); @@ -101,5 +100,5 @@ index f95ff19af..1e0ae42fe 100644 } charon->bus->set_sa(charon->bus, ike_sa); -- -2.25.4 +2.30.2 diff --git a/0002-charon-add-optional-source-and-remote-overrides-for-.patch b/0002-charon-add-optional-source-and-remote-overrides-for-.patch index b47682e..589877d 100644 --- a/0002-charon-add-optional-source-and-remote-overrides-for-.patch +++ b/0002-charon-add-optional-source-and-remote-overrides-for-.patch @@ -1,7 +1,7 @@ -From caa6f2744717e3c3bd9b0e0fa4feff449a780ccf Mon Sep 17 00:00:00 2001 +From 07e7ae0c9a9cac8c16361dc73412867d7a303054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Mon, 21 Sep 2015 13:41:58 +0300 -Subject: [PATCH 2/7] charon: add optional source and remote overrides for +Subject: [PATCH 2/5] charon: add optional source and remote overrides for initiate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -26,15 +26,15 @@ Signed-off-by: Timo Teräs .../processing/jobs/start_action_job.c | 2 +- src/libcharon/sa/ike_sa_manager.c | 51 +++++++++++++++- src/libcharon/sa/ike_sa_manager.h | 8 ++- - src/libcharon/sa/trap_manager.c | 49 +++++++-------- + src/libcharon/sa/trap_manager.c | 45 ++++++-------- src/swanctl/commands/initiate.c | 40 ++++++++++++- - 12 files changed, 219 insertions(+), 47 deletions(-) + 12 files changed, 217 insertions(+), 45 deletions(-) diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c -index b91c89830..55f8d224f 100644 +index 0481d78d4..805d6f198 100644 --- a/src/charon-cmd/cmd/cmd_connection.c +++ b/src/charon-cmd/cmd/cmd_connection.c -@@ -439,7 +439,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this) +@@ -438,7 +438,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this) child_cfg = create_child_cfg(this, peer_cfg); if (charon->controller->initiate(charon->controller, peer_cfg, child_cfg, @@ -44,10 +44,10 @@ index b91c89830..55f8d224f 100644 terminate(pid); } diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c -index dba12764d..8b27e61e4 100644 +index 83fcaf898..187953b29 100644 --- a/src/charon-nm/nm/nm_service.c +++ b/src/charon-nm/nm/nm_service.c -@@ -849,7 +849,7 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection, +@@ -864,7 +864,7 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection, * Prepare IKE_SA */ ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager, @@ -192,10 +192,10 @@ index 8d84b934e..b00d0e62d 100644 switch (status) { diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c -index eb679290d..81f2970ae 100644 +index 2a4d58eab..0e9d24d11 100644 --- a/src/libcharon/plugins/vici/vici_config.c +++ b/src/libcharon/plugins/vici/vici_config.c -@@ -2136,7 +2136,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg, +@@ -2149,7 +2149,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg, DBG1(DBG_CFG, "initiating '%s'", child_cfg->get_name(child_cfg)); charon->controller->initiate(charon->controller, peer_cfg->get_ref(peer_cfg), child_cfg->get_ref(child_cfg), @@ -471,34 +471,32 @@ index 2bc531b38..7220ea597 100644 - - ike_sa->set_peer_cfg(ike_sa, peer); - ike_cfg = ike_sa->get_ike_cfg(ike_sa); -- ++ { ++ ike_cfg_t *ike_cfg; ++ uint16_t port; ++ uint8_t mask; + - port = ike_cfg->get_other_port(ike_cfg); - dst->to_subnet(dst, &host, &mask); - host->set_port(host, port); - ike_sa->set_other_host(ike_sa, host); -- ++ ike_cfg = peer->get_ike_cfg(peer); + - port = ike_cfg->get_my_port(ike_cfg); - src->to_subnet(src, &host, &mask); - host->set_port(host, port); - ike_sa->set_my_host(ike_sa, host); -- ++ port = ike_cfg->get_other_port(ike_cfg); ++ dst->to_subnet(dst, &other_host, &mask); ++ other_host->set_port(other_host, port); + - charon->bus->set_sa(charon->bus, ike_sa); - } - } - else - { +- { - ike_sa = charon->ike_sa_manager->checkout_by_config( - charon->ike_sa_manager, peer); -+ ike_cfg_t *ike_cfg; -+ uint16_t port; -+ uint8_t mask; -+ -+ ike_cfg = peer->get_ike_cfg(peer); -+ -+ port = ike_cfg->get_other_port(ike_cfg); -+ dst->to_subnet(dst, &other_host, &mask); -+ other_host->set_port(other_host, port); -+ + port = ike_cfg->get_my_port(ike_cfg); + src->to_subnet(src, &my_host, &mask); + my_host->set_port(my_host, port); @@ -592,5 +590,5 @@ index 8ade8bf41..03b2cb0f4 100644 {"raw", 'r', 0, "dump raw response message"}, {"pretty", 'P', 0, "dump raw response message in pretty print"}, -- -2.25.4 +2.30.2 diff --git a/0003-vici-send-certificates-for-ike-sa-events.patch b/0003-vici-send-certificates-for-ike-sa-events.patch index 616c06e..5db3841 100644 --- a/0003-vici-send-certificates-for-ike-sa-events.patch +++ b/0003-vici-send-certificates-for-ike-sa-events.patch @@ -1,7 +1,7 @@ -From 82293ee990d4c640bd5e33e894d44b70ad50ef79 Mon Sep 17 00:00:00 2001 +From 42dc827df278ff1304fe7414c68fae756a9863f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Mon, 21 Sep 2015 13:42:05 +0300 -Subject: [PATCH 3/7] vici: send certificates for ike-sa events +Subject: [PATCH 3/5] vici: send certificates for ike-sa events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -127,5 +127,5 @@ index ad07ff12d..e3f6a0d26 100644 b->begin_section(b, old->get_name(old)); -- -2.25.4 +2.30.2 diff --git a/0004-vici-add-support-for-individual-sa-state-changes.patch b/0004-vici-add-support-for-individual-sa-state-changes.patch index 66defa7..c1d4ea7 100644 --- a/0004-vici-add-support-for-individual-sa-state-changes.patch +++ b/0004-vici-add-support-for-individual-sa-state-changes.patch @@ -1,7 +1,7 @@ -From 7df0e439a339286991dda5cc14f0eb078885401b Mon Sep 17 00:00:00 2001 +From c4e25fe6bb5338a2c5067ba74808d68183226420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Mon, 21 Sep 2015 13:42:11 +0300 -Subject: [PATCH 4/7] vici: add support for individual sa state changes +Subject: [PATCH 4/5] vici: add support for individual sa state changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -155,5 +155,5 @@ index e3f6a0d26..9968cdd3c 100644 .destroy = _destroy, }, -- -2.25.4 +2.30.2 diff --git a/0005-vici-add-deprecated-async-parameter.patch b/0005-vici-add-deprecated-async-parameter.patch deleted file mode 100644 index ce8307f..0000000 --- a/0005-vici-add-deprecated-async-parameter.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 467ba7f78ef3d09c27ac410f147cca66a6591a1e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= -Date: Mon, 21 Sep 2015 13:42:15 +0300 -Subject: [PATCH 5/7] vici: add (deprecated) async parameter -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is obsoleted by the new "timeout=-1" option that achieves -the same. Only for compatibility with old versions of quagga-nhrp. - -Signed-off-by: Timo Teräs ---- - src/libcharon/plugins/vici/vici_control.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c -index 1e8e788c3..12ef92334 100644 ---- a/src/libcharon/plugins/vici/vici_control.c -+++ b/src/libcharon/plugins/vici/vici_control.c -@@ -203,7 +203,7 @@ CALLBACK(initiate, vici_message_t*, - vici_message_t* msg; - host_t *my_host = NULL, *other_host = NULL; - int timeout; -- bool limits; -+ bool limits, async; - controller_cb_t log_cb = NULL; - log_info_t log = { - .dispatcher = this->dispatcher, -@@ -214,6 +214,7 @@ CALLBACK(initiate, vici_message_t*, - ike = request->get_str(request, NULL, "ike"); - timeout = request->get_int(request, 0, "timeout"); - limits = request->get_bool(request, FALSE, "init-limits"); -+ async = request->get_bool(request, FALSE, "async"); - log.level = request->get_int(request, 1, "loglevel"); - my_host_str = request->get_str(request, NULL, "my-host"); - other_host_str = request->get_str(request, NULL, "other-host"); -@@ -222,7 +223,7 @@ CALLBACK(initiate, vici_message_t*, - { - return send_reply(this, "missing configuration name"); - } -- if (timeout >= 0) -+ if (timeout >= 0 && !async) - { - log_cb = (controller_cb_t)log_vici; - } --- -2.25.4 - diff --git a/0007-vyos-terminate-connections-source-dest.patch b/0005-vyos-terminate-connections-source-dest.patch similarity index 91% rename from 0007-vyos-terminate-connections-source-dest.patch rename to 0005-vyos-terminate-connections-source-dest.patch index 170b379..e04c189 100644 --- a/0007-vyos-terminate-connections-source-dest.patch +++ b/0005-vyos-terminate-connections-source-dest.patch @@ -1,7 +1,7 @@ -From a0dedc6cae5828d048bcbb16392d17b7a168a260 Mon Sep 17 00:00:00 2001 +From 2f864ddad4c36726427cd0d4f19b00e226d2b2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Wed, 22 Jan 2020 13:12:39 +0100 -Subject: [PATCH 7/7] vyos-terminate-connections-source-dest +Subject: [PATCH 5/5] vyos-terminate-connections-source-dest --- src/libcharon/plugins/vici/vici_control.c | 27 ++++++++++++++++++++--- @@ -9,10 +9,10 @@ Subject: [PATCH 7/7] vyos-terminate-connections-source-dest 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c -index 12ef92334..d9cf1add5 100644 +index 1e8e788c3..914574ac3 100644 --- a/src/libcharon/plugins/vici/vici_control.c +++ b/src/libcharon/plugins/vici/vici_control.c -@@ -279,12 +279,13 @@ CALLBACK(terminate, vici_message_t*, +@@ -278,12 +278,13 @@ CALLBACK(terminate, vici_message_t*, private_vici_control_t *this, char *name, u_int id, vici_message_t *request) { enumerator_t *enumerator, *isas, *csas; @@ -27,7 +27,7 @@ index 12ef92334..d9cf1add5 100644 array_t *ids; vici_builder_t *builder; controller_cb_t log_cb = NULL; -@@ -300,12 +301,23 @@ CALLBACK(terminate, vici_message_t*, +@@ -299,12 +300,23 @@ CALLBACK(terminate, vici_message_t*, force = request->get_bool(request, FALSE, "force"); timeout = request->get_int(request, 0, "timeout"); log.level = request->get_int(request, 1, "loglevel"); @@ -53,7 +53,7 @@ index 12ef92334..d9cf1add5 100644 if (ike_id) { DBG1(DBG_CFG, "vici terminate IKE_SA #%d", ike_id); -@@ -368,6 +380,15 @@ CALLBACK(terminate, vici_message_t*, +@@ -367,6 +379,15 @@ CALLBACK(terminate, vici_message_t*, { array_insert(ids, ARRAY_TAIL, &ike_id); } @@ -120,5 +120,5 @@ index 2309843b2..37d0bde3f 100644 {"child-id", 'C', 1, "terminate by CHILD_SA reqid"}, {"ike-id", 'I', 1, "terminate by IKE_SA unique identifier"}, -- -2.25.4 +2.30.2 diff --git a/0006-support-gre-key-in-ikev1.patch b/0006-support-gre-key-in-ikev1.patch deleted file mode 100644 index ecaefae..0000000 --- a/0006-support-gre-key-in-ikev1.patch +++ /dev/null @@ -1,507 +0,0 @@ -From dffd2c31828ec4d9bf9a299952a1559675816241 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= -Date: Mon, 21 Sep 2015 13:42:18 +0300 -Subject: [PATCH 6/7] support gre key in ikev1 - -this implements gre key negotiation in ikev1 similarly to the -ipsec-tools patch in alpine. - -the from/to port pair is internally used as gre key for gre -protocol traffic selectors. since from/to pairs 0/0xffff and -0xffff/0 have special meaning, the gre keys 0xffff and 0xffff0000 -will not work. - -this is not standard compliant, and should probably not be upstreamed -or used widely, but it is applied for interoperability with alpine -racoon for the time being. ---- - src/libcharon/encoding/payloads/id_payload.c | 68 ++++++++++++++----- - src/libcharon/encoding/payloads/id_payload.h | 6 +- - .../kernel_netlink/kernel_netlink_ipsec.c | 40 ++++++++--- - src/libcharon/plugins/stroke/stroke_config.c | 5 ++ - src/libcharon/plugins/unity/unity_narrow.c | 2 +- - src/libcharon/plugins/vici/vici_config.c | 9 ++- - src/libcharon/sa/ikev1/tasks/quick_mode.c | 16 +++-- - .../selectors/traffic_selector.c | 33 ++++++++- - .../selectors/traffic_selector.h | 31 +++++++++ - 9 files changed, 171 insertions(+), 39 deletions(-) - -diff --git a/src/libcharon/encoding/payloads/id_payload.c b/src/libcharon/encoding/payloads/id_payload.c -index b2f1adbbc..6b44d0cf6 100644 ---- a/src/libcharon/encoding/payloads/id_payload.c -+++ b/src/libcharon/encoding/payloads/id_payload.c -@@ -245,18 +245,20 @@ METHOD(id_payload_t, get_identification, identification_t*, - * Create a traffic selector from an range ID - */ - static traffic_selector_t *get_ts_from_range(private_id_payload_t *this, -- ts_type_t type) -+ ts_type_t type, -+ uint16_t from_port, uint16_t to_port) - { - return traffic_selector_create_from_bytes(this->protocol_id, type, -- chunk_create(this->id_data.ptr, this->id_data.len / 2), this->port, -- chunk_skip(this->id_data, this->id_data.len / 2), this->port ?: 65535); -+ chunk_create(this->id_data.ptr, this->id_data.len / 2), from_port, -+ chunk_skip(this->id_data, this->id_data.len / 2), to_port); - } - - /** - * Create a traffic selector from an subnet ID - */ - static traffic_selector_t *get_ts_from_subnet(private_id_payload_t *this, -- ts_type_t type) -+ ts_type_t type, -+ uint16_t from_port, uint16_t to_port) - { - traffic_selector_t *ts; - chunk_t net, netmask; -@@ -269,7 +271,7 @@ static traffic_selector_t *get_ts_from_subnet(private_id_payload_t *this, - netmask.ptr[i] = (netmask.ptr[i] ^ 0xFF) | net.ptr[i]; - } - ts = traffic_selector_create_from_bytes(this->protocol_id, type, -- net, this->port, netmask, this->port ?: 65535); -+ net, from_port, netmask, to_port); - chunk_free(&netmask); - return ts; - } -@@ -278,51 +280,76 @@ static traffic_selector_t *get_ts_from_subnet(private_id_payload_t *this, - * Create a traffic selector from an IP ID - */ - static traffic_selector_t *get_ts_from_ip(private_id_payload_t *this, -- ts_type_t type) -+ ts_type_t type, -+ uint16_t from_port, uint16_t to_port) - { - return traffic_selector_create_from_bytes(this->protocol_id, type, -- this->id_data, this->port, this->id_data, this->port ?: 65535); -+ this->id_data, from_port, this->id_data, to_port); - } - - METHOD(id_payload_t, get_ts, traffic_selector_t*, -- private_id_payload_t *this) -+ private_id_payload_t *this, id_payload_t *other_, bool initiator) - { -+ private_id_payload_t *other = (private_id_payload_t *) other_; -+ uint16_t from_port, to_port; -+ -+ if (other && this->protocol_id == IPPROTO_GRE && other->protocol_id == IPPROTO_GRE) -+ { -+ if (initiator) -+ { -+ from_port = this->port; -+ to_port = other->port; -+ } -+ else -+ { -+ from_port = other->port; -+ to_port = this->port; -+ } -+ if (from_port == 0 && to_port == 0) -+ to_port = 0xffff; -+ } -+ else -+ { -+ from_port = this->port; -+ to_port = this->port ?: 0xffff; -+ } -+ - switch (this->id_type) - { - case ID_IPV4_ADDR_SUBNET: - if (this->id_data.len == 8) - { -- return get_ts_from_subnet(this, TS_IPV4_ADDR_RANGE); -+ return get_ts_from_subnet(this, TS_IPV4_ADDR_RANGE, from_port, to_port); - } - break; - case ID_IPV6_ADDR_SUBNET: - if (this->id_data.len == 32) - { -- return get_ts_from_subnet(this, TS_IPV6_ADDR_RANGE); -+ return get_ts_from_subnet(this, TS_IPV6_ADDR_RANGE, from_port, to_port); - } - break; - case ID_IPV4_ADDR_RANGE: - if (this->id_data.len == 8) - { -- return get_ts_from_range(this, TS_IPV4_ADDR_RANGE); -+ return get_ts_from_range(this, TS_IPV4_ADDR_RANGE, from_port, to_port); - } - break; - case ID_IPV6_ADDR_RANGE: - if (this->id_data.len == 32) - { -- return get_ts_from_range(this, TS_IPV6_ADDR_RANGE); -+ return get_ts_from_range(this, TS_IPV6_ADDR_RANGE, from_port, to_port); - } - break; - case ID_IPV4_ADDR: - if (this->id_data.len == 4) - { -- return get_ts_from_ip(this, TS_IPV4_ADDR_RANGE); -+ return get_ts_from_ip(this, TS_IPV4_ADDR_RANGE, from_port, to_port); - } - break; - case ID_IPV6_ADDR: - if (this->id_data.len == 16) - { -- return get_ts_from_ip(this, TS_IPV6_ADDR_RANGE); -+ return get_ts_from_ip(this, TS_IPV6_ADDR_RANGE, from_port, to_port); - } - break; - default: -@@ -397,7 +424,7 @@ id_payload_t *id_payload_create_from_identification(payload_type_t type, - /* - * Described in header. - */ --id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts) -+id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts, bool initiator) - { - private_id_payload_t *this; - uint8_t mask; -@@ -460,8 +487,17 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts) - ts->get_from_address(ts), ts->get_to_address(ts)); - net->destroy(net); - } -- this->port = ts->get_from_port(ts); - this->protocol_id = ts->get_protocol(ts); -+ if (initiator || this->protocol_id != IPPROTO_GRE) -+ { -+ this->port = ts->get_from_port(ts); -+ } -+ else -+ { -+ this->port = ts->get_to_port(ts); -+ if (this->port == 0xffff && ts->get_from_port(ts) == 0) -+ this->port = 0; -+ } - this->payload_length += this->id_data.len; - - return &this->public; -diff --git a/src/libcharon/encoding/payloads/id_payload.h b/src/libcharon/encoding/payloads/id_payload.h -index 044268180..1e2306b16 100644 ---- a/src/libcharon/encoding/payloads/id_payload.h -+++ b/src/libcharon/encoding/payloads/id_payload.h -@@ -48,11 +48,11 @@ struct id_payload_t { - identification_t *(*get_identification) (id_payload_t *this); - - /** -- * Creates a traffic selector form a ID_ADDR_SUBNET/RANGE identity. -+ * Creates a traffic selector form a ID_ADDR_SUBNET/RANGE identity pair. - * - * @return traffic selector, NULL on failure - */ -- traffic_selector_t* (*get_ts)(id_payload_t *this); -+ traffic_selector_t* (*get_ts)(id_payload_t *this, id_payload_t *other, bool initiator); - - /** - * Get encoded payload without fixed payload header (used for IKEv1). -@@ -91,6 +91,6 @@ id_payload_t *id_payload_create_from_identification(payload_type_t type, - * @param ts traffic selector - * @return PLV1_ID id_payload_t object. - */ --id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts); -+id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts, bool initiator); - - #endif /** ID_PAYLOAD_H_ @}*/ -diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c -index ef0d424bd..a0948f7c0 100644 ---- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c -+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c -@@ -814,7 +814,18 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src, - ts2subnet(src, &sel.saddr, &sel.prefixlen_s); - ts2ports(dst, &sel.dport, &sel.dport_mask); - ts2ports(src, &sel.sport, &sel.sport_mask); -- if ((sel.proto == IPPROTO_ICMP || sel.proto == IPPROTO_ICMPV6) && -+ if (sel.proto == IPPROTO_GRE) -+ { -+ sel.sport = htons(src->get_from_port(src)); -+ sel.dport = htons(src->get_to_port(src)); -+ sel.sport_mask = ~0; -+ sel.dport_mask = ~0; -+ if (sel.sport == htons(0) && sel.dport == htons(0xffff)) -+ { -+ sel.sport = sel.dport = sel.sport_mask = sel.dport_mask = 0; -+ } -+ } -+ else if ((sel.proto == IPPROTO_ICMP || sel.proto == IPPROTO_ICMPV6) && - (sel.dport || sel.sport)) - { - /* the kernel expects the ICMP type and code in the source and -@@ -838,7 +849,7 @@ static traffic_selector_t* selector2ts(struct xfrm_selector *sel, bool src) - { - u_char *addr; - uint8_t prefixlen; -- uint16_t port = 0; -+ uint16_t from_port = 0, to_port = 65535; - host_t *host = NULL; - - if (src) -@@ -847,7 +858,7 @@ static traffic_selector_t* selector2ts(struct xfrm_selector *sel, bool src) - prefixlen = sel->prefixlen_s; - if (sel->sport_mask) - { -- port = ntohs(sel->sport); -+ from_port = to_port = ntohs(sel->sport); - } - } - else -@@ -856,14 +867,27 @@ static traffic_selector_t* selector2ts(struct xfrm_selector *sel, bool src) - prefixlen = sel->prefixlen_d; - if (sel->dport_mask) - { -- port = ntohs(sel->dport); -+ from_port = to_port = ntohs(sel->dport); - } - } -- if (sel->proto == IPPROTO_ICMP || sel->proto == IPPROTO_ICMPV6) -+ if (sel->proto == IPPROTO_GRE) -+ { -+ if (sel->sport_mask) -+ { -+ from_port = ntohs(sel->sport); -+ to_port = ntohs(sel->dport); -+ } -+ else -+ { -+ from_port = 0; -+ to_port = 0xffff; -+ } -+ } -+ else if (sel->proto == IPPROTO_ICMP || sel->proto == IPPROTO_ICMPV6) - { /* convert ICMP[v6] message type and code as supplied by the kernel in - * source and destination ports (both in network order) */ -- port = (sel->sport >> 8) | (sel->dport & 0xff00); -- port = ntohs(port); -+ from_port = (sel->sport >> 8) | (sel->dport & 0xff00); -+ from_port = to_port = ntohs(from_port); - } - /* The Linux 2.6 kernel does not set the selector's family field, - * so as a kludge we additionally test the prefix length. -@@ -880,7 +904,7 @@ static traffic_selector_t* selector2ts(struct xfrm_selector *sel, bool src) - if (host) - { - return traffic_selector_create_from_subnet(host, prefixlen, -- sel->proto, port, port ?: 65535); -+ sel->proto, from_port, to_port); - } - return NULL; - } -diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c -index 175b6b549..db3e558f6 100644 ---- a/src/libcharon/plugins/stroke/stroke_config.c -+++ b/src/libcharon/plugins/stroke/stroke_config.c -@@ -936,6 +936,11 @@ static bool parse_protoport(char *token, uint16_t *from_port, - *from_port = 0xffff; - *to_port = 0; - } -+ else if (*port && *protocol == IPPROTO_GRE) -+ { -+ p = strtol(port, &endptr, 0); -+ traffic_selector_split_grekey(p, from_port, to_port); -+ } - else if (*port) - { - svc = getservbyname(port, NULL); -diff --git a/src/libcharon/plugins/unity/unity_narrow.c b/src/libcharon/plugins/unity/unity_narrow.c -index afbd6cc7e..911fe70c6 100644 ---- a/src/libcharon/plugins/unity/unity_narrow.c -+++ b/src/libcharon/plugins/unity/unity_narrow.c -@@ -248,7 +248,7 @@ METHOD(listener_t, message, bool, - if (!first) - { - id_payload = (id_payload_t*)payload; -- tsr = id_payload->get_ts(id_payload); -+ tsr = id_payload->get_ts(id_payload, NULL, FALSE); - break; - } - first = FALSE; -diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c -index 81f2970ae..92ab77a00 100644 ---- a/src/libcharon/plugins/vici/vici_config.c -+++ b/src/libcharon/plugins/vici/vici_config.c -@@ -709,8 +709,13 @@ CALLBACK(parse_ts, bool, - } - else if (*port && !streq(port, "any")) - { -- svc = getservbyname(port, NULL); -- if (svc) -+ if (proto == IPPROTO_GRE) -+ { -+ p = strtol(port, &end, 0); -+ if (*end) return FALSE; -+ traffic_selector_split_grekey(p, &from, &to); -+ } -+ else if ((svc = getservbyname(port, NULL)) != NULL) - { - from = to = ntohs(svc->s_port); - } -diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c -index 50c280fe5..049da8847 100644 ---- a/src/libcharon/sa/ikev1/tasks/quick_mode.c -+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c -@@ -552,9 +552,9 @@ static void add_ts(private_quick_mode_t *this, message_t *message) - { - id_payload_t *id_payload; - -- id_payload = id_payload_create_from_ts(this->tsi); -+ id_payload = id_payload_create_from_ts(this->tsi, TRUE); - message->add_payload(message, &id_payload->payload_interface); -- id_payload = id_payload_create_from_ts(this->tsr); -+ id_payload = id_payload_create_from_ts(this->tsr, FALSE); - message->add_payload(message, &id_payload->payload_interface); - } - -@@ -565,7 +565,7 @@ static bool get_ts(private_quick_mode_t *this, message_t *message) - { - traffic_selector_t *tsi = NULL, *tsr = NULL; - enumerator_t *enumerator; -- id_payload_t *id_payload; -+ id_payload_t *idi = NULL, *idr = NULL; - payload_t *payload; - host_t *hsi, *hsr; - bool first = TRUE; -@@ -575,20 +575,22 @@ static bool get_ts(private_quick_mode_t *this, message_t *message) - { - if (payload->get_type(payload) == PLV1_ID) - { -- id_payload = (id_payload_t*)payload; -- - if (first) - { -- tsi = id_payload->get_ts(id_payload); -+ idi = (id_payload_t*)payload; - first = FALSE; - } - else - { -- tsr = id_payload->get_ts(id_payload); -+ idr = (id_payload_t*)payload; - break; - } - } - } -+ if (idi && idr) { -+ tsi = idi->get_ts(idi, idr, TRUE); -+ tsr = idr->get_ts(idr, idi, FALSE); -+ } - enumerator->destroy(enumerator); - - /* create host2host selectors if ID payloads missing */ -diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c -index cfd2b029d..d01e2ccec 100644 ---- a/src/libstrongswan/selectors/traffic_selector.c -+++ b/src/libstrongswan/selectors/traffic_selector.c -@@ -198,6 +198,14 @@ static int print_icmp(printf_hook_data_t *data, uint16_t port) - return print_in_hook(data, "%d", type); - } - -+/** -+ * Print GRE key -+ */ -+static int print_grekey(printf_hook_data_t *data, uint16_t from_port, uint16_t to_port) -+{ -+ return print_in_hook(data, "%d", traffic_selector_grekey(from_port, to_port)); -+} -+ - /** - * Described in header. - */ -@@ -303,7 +311,11 @@ int traffic_selector_printf_hook(printf_hook_data_t *data, - { - written += print_in_hook(data, "/"); - -- if (this->from_port == this->to_port) -+ if (this->protocol == IPPROTO_GRE) -+ { -+ written += print_grekey(data, this->from_port, this->to_port); -+ } -+ else if (this->from_port == this->to_port) - { - struct servent *serv; - -@@ -377,7 +389,24 @@ METHOD(traffic_selector_t, get_subset, traffic_selector_t*, - /* select protocol, which is not zero */ - protocol = max(this->protocol, other->protocol); - -- if ((is_opaque(this) && is_opaque(other)) || -+ if (this->protocol == IPPROTO_GRE) -+ { -+ if (is_any(this)) -+ { -+ from_port = other->from_port; -+ to_port = other->to_port; -+ } -+ else if (is_any(other) || -+ (this->from_port == other->from_port && -+ this->to_port == other->to_port)) -+ { -+ from_port = this->from_port; -+ to_port = this->to_port; -+ } -+ else -+ return NULL; -+ } -+ else if ((is_opaque(this) && is_opaque(other)) || - (is_opaque(this) && is_any(other)) || - (is_opaque(other) && is_any(this))) - { -diff --git a/src/libstrongswan/selectors/traffic_selector.h b/src/libstrongswan/selectors/traffic_selector.h -index 03f7a6d8c..b27ca4ad1 100644 ---- a/src/libstrongswan/selectors/traffic_selector.h -+++ b/src/libstrongswan/selectors/traffic_selector.h -@@ -120,6 +120,9 @@ struct traffic_selector_t { - * 8 bits and the code in the least significant 8 bits. Use the utility - * functions to extract them. - * -+ * If the protocol is GRE, the high 16-bits of the 32-bit GRE key is stored -+ * in the from port. Use the utility function to merge and split them. -+ * - * @return port - */ - uint16_t (*get_from_port)(traffic_selector_t *this); -@@ -134,6 +137,9 @@ struct traffic_selector_t { - * 8 bits and the code in the least significant 8 bits. Use the utility - * functions to extract them. - * -+ * If the protocol is GRE, the low 16-bits of the 32-bit GRE key is stored -+ * in the to port. Use the utility function to merge and split them. -+ * - * @return port - */ - uint16_t (*get_to_port)(traffic_selector_t *this); -@@ -277,6 +283,31 @@ static inline uint8_t traffic_selector_icmp_code(uint16_t port) - int traffic_selector_cmp(traffic_selector_t *a, traffic_selector_t *b, - void *opts); - -+/** -+ * Reconstruct the 32-bit GRE KEY in host order from a from/to ports. -+ * -+ * @param from_port port number in host order -+ * @param to_port port number in host order -+ * @return GRE KEY in host order -+ */ -+static inline uint32_t traffic_selector_grekey(uint16_t from_port, uint16_t to_port) -+{ -+ return (from_port << 16) | to_port; -+} -+ -+/** -+ * Split 32-bit GRE KEY in host order to from/to ports. -+ * -+ * @param grekey grekey in host order -+ * @param from_port from port in host order -+ * @param to_port to port in host order -+ */ -+static inline void traffic_selector_split_grekey(uint32_t grekey, uint16_t *from_port, uint16_t *to_port) -+{ -+ *from_port = grekey >> 16; -+ *to_port = grekey & 0xffff; -+} -+ - /** - * Create a new traffic selector using human readable params. - * --- -2.25.4 - diff --git a/strongswan.spec b/strongswan.spec index a8e62fc..1ba2fa9 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,6 +1,6 @@ %global _hardened_build 1 #%%define prerelease dr1 -%global dist .nhrp.3%{?dist} +%global dist .nhrp.4%{?dist} Name: strongswan Version: 5.9.0 @@ -18,9 +18,7 @@ Patch10: 0001-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch Patch11: 0002-charon-add-optional-source-and-remote-overrides-for-.patch Patch12: 0003-vici-send-certificates-for-ike-sa-events.patch Patch13: 0004-vici-add-support-for-individual-sa-state-changes.patch -Patch14: 0005-vici-add-deprecated-async-parameter.patch -Patch15: 0006-support-gre-key-in-ikev1.patch -Patch16: 0007-vyos-terminate-connections-source-dest.patch +Patch14: 0005-vyos-terminate-connections-source-dest.patch # only needed for pre-release versions #BuildRequires: autoconf automake @@ -98,8 +96,6 @@ PT-TLS to support TNC over TLS. %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch16 -p1 %build # only for snapshots