Support GRE key in selectors

Patch vici for NHRP
2024-05-19 20:39:30 +02:00 · 2024-05-19 20:39:30 +02:00
8 changed files with 636 additions and 482 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,3 @@
 /strongswan-5.9.10.tar.bz2.sig
 /strongswan-5.9.11.tar.bz2
 /strongswan-5.9.11.tar.bz2.sig
-/strongswan-5.9.14.tar.bz2
-/strongswan-5.9.14.tar.bz2.sig
--- a/0001-charon-add-optional-source-and-remote-overrides-for-.patch
+++ b/0001-charon-add-optional-source-and-remote-overrides-for-.patch
@@ -1,37 +1,115 @@
-From d917774f73954cc6367e73b775ff9ea115d6fd28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zpericic@netst.org>
-Date: Tue, 9 Jul 2024 19:07:57 +0200
-Subject: [PATCH 1/4] charon: add optional source and remote overrides for
+From ec53b2914730f08d151d14e9b48557196ec0cc49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 21 Sep 2015 13:41:58 +0300
+Subject: [PATCH 1/3] charon: add optional source and remote overrides for
 initiate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit

 This introduces support for specifying optional IKE SA specific
 source and remote address for child sa initiation. This allows
 to initiate wildcard connection for known address via vici.

-In addition this allows simpler implementation of trap-any patches
+In addition this allows impler implementation of trap-any patches
 and is a prerequisite for dmvpn support.
---
- src/libcharon/control/controller.c        | 34 ++++++++++++++++--
- src/libcharon/control/controller.h        | 28 +++++++++++++++
- src/libcharon/plugins/vici/vici_control.c | 41 +++++++++++++++++----
- src/libcharon/sa/ike_sa_manager.c         | 34 +++++++++++++++++-
- src/libcharon/sa/ike_sa_manager.h         | 25 ++++++++++++-
- src/libcharon/sa/trap_manager.c           | 44 +++++++++--------------
- src/swanctl/commands/initiate.c           | 19 +++++++++-
- 7 files changed, 186 insertions(+), 39 deletions(-)

+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ src/charon-cmd/cmd/cmd_connection.c           |  2 +-
+ src/charon-nm/nm/nm_service.c                 |  2 +-
+ src/conftest/actions.c                        |  2 +-
+ src/libcharon/control/controller.c            | 43 +++++++++++++-
+ src/libcharon/control/controller.h            |  3 +
+ .../plugins/load_tester/load_tester_control.c |  1 +
+ .../plugins/load_tester/load_tester_plugin.c  |  1 +
+ src/libcharon/plugins/medcli/medcli_config.c  |  2 +-
+ src/libcharon/plugins/smp/smp.c               |  3 +-
+ src/libcharon/plugins/stroke/stroke_control.c |  5 +-
+ src/libcharon/plugins/uci/uci_control.c       |  3 +-
+ src/libcharon/plugins/vici/vici_config.c      |  2 +-
+ src/libcharon/plugins/vici/vici_control.c     | 59 +++++++++++++++++--
+ .../processing/jobs/initiate_mediation_job.c  |  1 +
+ .../processing/jobs/start_action_job.c        |  2 +-
+ src/libcharon/sa/ike_sa_manager.c             | 49 ++++++++++++++-
+ src/libcharon/sa/ike_sa_manager.h             |  8 ++-
+ src/libcharon/sa/trap_manager.c               | 44 ++++++--------
+ src/swanctl/commands/initiate.c               | 40 ++++++++++++-
+ 21 files changed, 225 insertions(+), 50 deletions(-)
+
+diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
+index 2e2cb3ca2..b9369a8a2 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)
+ 	child_cfg = create_child_cfg(this, peer_cfg);
+ 
+ 	if (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-				controller_cb_empty, NULL, LEVEL_SILENT, 0, FALSE) != SUCCESS)
+				NULL, NULL, controller_cb_empty, NULL, LEVEL_SILENT, 0, FALSE) != SUCCESS)
+ 	{
+ 		terminate(pid);
+ 	}
+diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
+index 7f88514a7..4c3491984 100644
+--- a/src/charon-nm/nm/nm_service.c
+++ b/src/charon-nm/nm/nm_service.c
+@@ -942,7 +942,7 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
+ 	 * Prepare IKE_SA
+ 	 */
+ 	ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
+-														peer_cfg);
+														peer_cfg, NULL, NULL);
+ 	peer_cfg->destroy(peer_cfg);
+ 	if (!ike_sa)
+ 	{
+diff --git a/src/conftest/actions.c b/src/conftest/actions.c
+index b6b186117..21e329e3e 100644
+--- a/src/conftest/actions.c
+++ b/src/conftest/actions.c
+@@ -66,7 +66,7 @@ static job_requeue_t initiate(char *config)
+ 	{
+ 		DBG1(DBG_CFG, "initiating IKE_SA for CHILD_SA config '%s'", config);
+ 		charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-									 NULL, NULL, 0, 0, FALSE);
+									 NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 	}
+ 	else
+ 	{
 diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
-index 027f48e937..ac4661a323 100644
+index 027f48e93..9109b20e4 100644
 --- a/src/libcharon/control/controller.c
 +++ b/src/libcharon/control/controller.c
-@@ -1,4 +1,6 @@
- /*
-+ * Copyright (C) 2023 Zoran Peričić <zpericic@netst.org>
+@@ -15,6 +15,28 @@
+  * for more details.
+  */
+ 
+/*
 + * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-  * Copyright (C) 2011-2023 Tobias Brunner
-  * Copyright (C) 2007-2011 Martin Willi
-  *
-@@ -107,6 +109,16 @@ struct interface_listener_t {
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+ #include "controller.h"
+ 
+ #include <sys/types.h>
+@@ -107,6 +129,16 @@ struct interface_listener_t {
 	 */
 	ike_sa_t *ike_sa;
 
@@ -48,16 +126,15 @@ index 027f48e937..ac4661a323 100644
 	/**
 	 * unique ID, used for various methods
 	 */
-@@ -417,10 +429,16 @@ METHOD(job_t, initiate_execute, job_requeue_t,
+@@ -417,10 +449,16 @@ METHOD(job_t, initiate_execute, job_requeue_t,
 	ike_sa_t *ike_sa;
 	interface_listener_t *listener = &job->listener;
 	peer_cfg_t *peer_cfg = listener->peer_cfg;
 +	host_t *my_host = listener->my_host;
 +	host_t *other_host = listener->other_host;
 
-	ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
+ 	ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
 -														peer_cfg);
-+	ike_sa = charon->ike_sa_manager->checkout_by_config2(charon->ike_sa_manager,
 +														peer_cfg, my_host, other_host);
 	peer_cfg->destroy(peer_cfg);
 +
@@ -67,23 +144,15 @@ index 027f48e937..ac4661a323 100644
 	if (!ike_sa)
 	{
 		DESTROY_IF(listener->child_cfg);
-@@ -501,6 +519,15 @@ METHOD(controller_t, initiate, status_t,
+@@ -499,6 +537,7 @@ METHOD(job_t, initiate_execute, job_requeue_t,
+ 
+ METHOD(controller_t, initiate, status_t,
 	private_controller_t *this, peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
+	host_t *my_host, host_t *other_host,
 	controller_cb_t callback, void *param, level_t max_level, u_int timeout,
 	bool limits)
-+{
-+	return this->public.initiate2(&this->public, peer_cfg, child_cfg, NULL, NULL, callback, param, max_level, timeout, limits);
-+}
-+
-+METHOD(controller_t, initiate2, status_t,
-+	private_controller_t *this, peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
-+	host_t *my_host, host_t *other_host,
-+	controller_cb_t callback, void *param, level_t max_level, u_int timeout,
-+	bool limits)
 {
- 	interface_job_t *job;
- 	status_t status;
-@@ -523,6 +550,8 @@ METHOD(controller_t, initiate, status_t,
+@@ -523,6 +562,8 @@ METHOD(controller_t, initiate, status_t,
 			.status = FAILED,
 			.child_cfg = child_cfg,
 			.peer_cfg = peer_cfg,
@@ -92,65 +161,162 @@ index 027f48e937..ac4661a323 100644
 			.lock = spinlock_create(),
 			.options.limits = limits,
 		},
-@@ -770,6 +799,7 @@ controller_t *controller_create(void)
- 		.public = {
- 			.create_ike_sa_enumerator = _create_ike_sa_enumerator,
- 			.initiate = _initiate,
-+			.initiate2 = _initiate2,
- 			.terminate_ike = _terminate_ike,
- 			.terminate_child = _terminate_child,
- 			.destroy = _destroy,
 diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
-index 36a1d46317..f5c60e2e72 100644
+index 36a1d4631..a130fbb6b 100644
 --- a/src/libcharon/control/controller.h
 +++ b/src/libcharon/control/controller.h
-@@ -98,6 +98,34 @@ struct controller_t {
+@@ -81,6 +81,8 @@ struct controller_t {
+ 	 *
+ 	 * @param peer_cfg		peer_cfg to use for IKE_SA setup
+ 	 * @param child_cfg		optional child_cfg to set up CHILD_SA from
+	 * @param my_host		optional address hint for source
+	 * @param other_host		optional address hint for destination
+ 	 * @param cb			logging callback
+ 	 * @param param			parameter to include in each call of cb
+ 	 * @param max_level		maximum log level for which cb is invoked
+@@ -95,6 +97,7 @@ struct controller_t {
+ 	 */
+ 	status_t (*initiate)(controller_t *this,
+ 						 peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
+						 host_t *my_host, host_t *other_host,
 						 controller_cb_t callback, void *param,
 						 level_t max_level, u_int timeout, bool limits);
 
-+	/**
-+	 * Initiate a CHILD_SA, and if required, an IKE_SA.
-+	 *
-+	 * If a callback is provided the function is synchronous and thus blocks
-+	 * until the IKE_SA is established or failed.
-+	 *
-+	 * @param peer_cfg		peer_cfg to use for IKE_SA setup
-+	 * @param child_cfg		optional child_cfg to set up CHILD_SA from
-+	 * @param my_host		optional address hint for source
-+	 * @param other_host		optional address hint for destination
-+	 * @param cb			logging callback
-+	 * @param param			parameter to include in each call of cb
-+	 * @param max_level		maximum log level for which cb is invoked
-+	 * @param timeout		timeout in ms to wait for callbacks, 0 to disable
-+	 * @param limits		whether to check limits regarding IKE_SA initiation
-+	 * @return
-+	 *						- SUCCESS, if CHILD_SA established
-+	 *						- FAILED, if setup failed
-+	 *						- NEED_MORE, if callback returned FALSE
-+	 *						- OUT_OF_RES if timed out
-+	 *						- INVALID_STATE if limits prevented initiation
-+	 */
-+	status_t (*initiate2)(controller_t *this,
-+						 peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
-+						 host_t *my_host, host_t *other_host,
-+						 controller_cb_t callback, void *param,
-+						 level_t max_level, u_int timeout, bool limits);
-+
- 	/**
- 	 * Terminate an IKE_SA and all of its CHILD_SAs.
- 	 *
+diff --git a/src/libcharon/plugins/load_tester/load_tester_control.c b/src/libcharon/plugins/load_tester/load_tester_control.c
+index b5356289a..ddef85b4a 100644
+--- a/src/libcharon/plugins/load_tester/load_tester_control.c
+++ b/src/libcharon/plugins/load_tester/load_tester_control.c
+@@ -240,6 +240,7 @@ static bool on_accept(private_load_tester_control_t *this, stream_t *io)
+ 
+ 		switch (charon->controller->initiate(charon->controller,
+ 							peer_cfg, child_cfg->get_ref(child_cfg),
+							NULL, NULL,
+ 							(void*)initiate_cb, listener, LEVEL_CTRL, 0, FALSE))
+ 		{
+ 			case NEED_MORE:
+diff --git a/src/libcharon/plugins/load_tester/load_tester_plugin.c b/src/libcharon/plugins/load_tester/load_tester_plugin.c
+index 695e75b83..e3f740281 100644
+--- a/src/libcharon/plugins/load_tester/load_tester_plugin.c
+++ b/src/libcharon/plugins/load_tester/load_tester_plugin.c
+@@ -152,6 +152,7 @@ static job_requeue_t do_load_test(private_load_tester_plugin_t *this)
+ 
+ 		charon->controller->initiate(charon->controller,
+ 					peer_cfg, child_cfg->get_ref(child_cfg),
+					NULL, NULL,
+ 					NULL, NULL, 0, 0, FALSE);
+ 		if (s)
+ 		{
+diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
+index 3211a49f1..f98b3eac8 100644
+--- a/src/libcharon/plugins/medcli/medcli_config.c
+++ b/src/libcharon/plugins/medcli/medcli_config.c
+@@ -350,7 +350,7 @@ static job_requeue_t initiate_config(peer_cfg_t *peer_cfg)
+ 		peer_cfg->get_ref(peer_cfg);
+ 		enumerator->destroy(enumerator);
+ 		charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-									 NULL, NULL, 0, 0, FALSE);
+									 NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 	}
+ 	else
+ 	{
+diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
+index 91dddfeaa..1e9326822 100644
+--- a/src/libcharon/plugins/smp/smp.c
+++ b/src/libcharon/plugins/smp/smp.c
+@@ -494,7 +494,8 @@ static void request_control_initiate(xmlTextReaderPtr reader,
+ 			if (child)
+ 			{
+ 				status = charon->controller->initiate(charon->controller,
+-							peer, child, (controller_cb_t)xml_callback,
+							peer, child, NULL, NULL,
+							(controller_cb_t)xml_callback,
+ 							writer, LEVEL_CTRL, 0, FALSE);
+ 			}
+ 			else
+diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
+index 2824c93cb..21ff6b31f 100644
+--- a/src/libcharon/plugins/stroke/stroke_control.c
+++ b/src/libcharon/plugins/stroke/stroke_control.c
+@@ -109,7 +109,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
+ 	if (msg->output_verbosity < 0)
+ 	{
+ 		charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-									 NULL, NULL, 0, 0, FALSE);
+									 NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 	}
+ 	else
+ 	{
+@@ -117,7 +117,8 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
+ 		status_t status;
+ 
+ 		status = charon->controller->initiate(charon->controller,
+-							peer_cfg, child_cfg, (controller_cb_t)stroke_log,
+							peer_cfg, child_cfg, NULL, NULL,
+							(controller_cb_t)stroke_log,
+ 							&info, msg->output_verbosity, this->timeout, FALSE);
+ 		switch (status)
+ 		{
+diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c
+index b033c832c..f8d1be745 100644
+--- a/src/libcharon/plugins/uci/uci_control.c
+++ b/src/libcharon/plugins/uci/uci_control.c
+@@ -147,7 +147,8 @@ static void initiate(private_uci_control_t *this, char *name)
+ 		enumerator = peer_cfg->create_child_cfg_enumerator(peer_cfg);
+ 		if (enumerator->enumerate(enumerator, &child_cfg) &&
+ 			charon->controller->initiate(charon->controller, peer_cfg,
+-							child_cfg->get_ref(child_cfg), controller_cb_empty,
+							child_cfg->get_ref(child_cfg), NULL, NULL,
+							controller_cb_empty,
+ 							NULL, LEVEL_SILENT, 0, FALSE) == SUCCESS)
+ 		{
+ 			write_fifo(this, "connection '%s' established\n", name);
+diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
+index 522122562..b1486e337 100644
+--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
+@@ -2252,7 +2252,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),
+-					NULL, NULL, 0, 0, FALSE);
+					NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 	}
+ }
+ 
 diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
-index 1c236d2491..932d0cb5a8 100644
+index 1c236d249..b3a76efa2 100644
 --- a/src/libcharon/plugins/vici/vici_control.c
 +++ b/src/libcharon/plugins/vici/vici_control.c
-@@ -1,4 +1,6 @@
- /*
-+ * Copyright (C) 2023 Zoran Peričić <zpericic@netst.org>
+@@ -15,6 +15,28 @@
+  * for more details.
+  */
+ 
+/*
 + * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-  * Copyright (C) 2015-2017 Tobias Brunner
-  * Copyright (C) 2014 Martin Willi
-  *
-@@ -173,9 +175,12 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+ #include "vici_control.h"
+ #include "vici_builder.h"
+ 
+@@ -173,9 +195,12 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
 CALLBACK(initiate, vici_message_t*,
 	private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
 {
@@ -163,7 +329,7 @@ index 1c236d2491..932d0cb5a8 100644
 	int timeout;
 	bool limits;
 	controller_cb_t log_cb = NULL;
-@@ -189,6 +194,8 @@ CALLBACK(initiate, vici_message_t*,
+@@ -189,6 +214,8 @@ CALLBACK(initiate, vici_message_t*,
 	timeout = request->get_int(request, 0, "timeout");
 	limits = request->get_bool(request, FALSE, "init-limits");
 	log.level = request->get_int(request, 1, "loglevel");
@@ -172,7 +338,7 @@ index 1c236d2491..932d0cb5a8 100644
 
 	if (!child && !ike)
 	{
-@@ -202,28 +209,48 @@ CALLBACK(initiate, vici_message_t*,
+@@ -202,28 +229,48 @@ CALLBACK(initiate, vici_message_t*,
 	type = child ? "CHILD_SA" : "IKE_SA";
 	sa = child ?: ike;
 
@@ -196,8 +362,7 @@ index 1c236d2491..932d0cb5a8 100644
 +		msg = send_reply(this, "%s config '%s' not found", type, sa);
 +		goto ret;
 	}
-	switch (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
-+	switch (charon->controller->initiate2(charon->controller, peer_cfg, child_cfg,
+ 	switch (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
 +										 my_host, other_host,
 										 log_cb, &log, log.level, timeout, limits))
 	{
@@ -228,33 +393,75 @@ index 1c236d2491..932d0cb5a8 100644
 }
 
 /**
+diff --git a/src/libcharon/processing/jobs/initiate_mediation_job.c b/src/libcharon/processing/jobs/initiate_mediation_job.c
+index ed493bc76..9a1cdcda4 100644
+--- a/src/libcharon/processing/jobs/initiate_mediation_job.c
+++ b/src/libcharon/processing/jobs/initiate_mediation_job.c
+@@ -138,6 +138,7 @@ METHOD(job_t, initiate, job_requeue_t,
+ 		mediation_cfg->get_ref(mediation_cfg);
+ 
+ 		if (charon->controller->initiate(charon->controller, mediation_cfg, NULL,
+							NULL, NULL,
+ 							(controller_cb_t)initiate_callback, this, LEVEL_CTRL,
+ 							0, FALSE) != SUCCESS)
+ 		{
+diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
+index 122e5cee9..dec458c84 100644
+--- a/src/libcharon/processing/jobs/start_action_job.c
+++ b/src/libcharon/processing/jobs/start_action_job.c
+@@ -84,7 +84,7 @@ METHOD(job_t, execute, job_requeue_t,
+ 				charon->controller->initiate(charon->controller,
+ 											 peer_cfg->get_ref(peer_cfg),
+ 											 child_cfg->get_ref(child_cfg),
+-											 NULL, NULL, 0, 0, FALSE);
+											 NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 			}
+ 		}
+ 		children->destroy(children);
 diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 7763ae844e..cf53e9ae00 100644
+index fc31c2a7c..0836b8c78 100644
 --- a/src/libcharon/sa/ike_sa_manager.c
 +++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -1,5 +1,7 @@
- /*
-  * Copyright (C) 2008-2022 Tobias Brunner
-+ * Copyright (C) 2023 Zoran Peričić <zpericic@netst.org>
+@@ -16,6 +16,28 @@
+  * for more details.
+  */
+ 
+/*
 + * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-  * Copyright (C) 2005-2011 Martin Willi
-  * Copyright (C) 2005 Jan Hutter
-  *
-@@ -1499,6 +1501,13 @@ typedef struct {
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+ #include <string.h>
+ #include <inttypes.h>
+ 
+@@ -1497,7 +1519,8 @@ typedef struct {
+ } config_entry_t;
 
 METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- 	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg)
-+{
-+	return this->public.checkout_by_config2(&this->public, peer_cfg, NULL, NULL);
-+}
-+
-+METHOD(ike_sa_manager_t, checkout_by_config2, ike_sa_t*,
+-	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg)
 +	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg,
 +	host_t *my_host, host_t *other_host)
 {
 	enumerator_t *enumerator;
 	entry_t *entry;
-@@ -1509,7 +1518,16 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+@@ -1508,7 +1531,16 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
 	u_int segment;
 	int i;
 
@@ -272,7 +479,7 @@ index 7763ae844e..cf53e9ae00 100644
 
 	if (!this->reuse_ikesa && peer_cfg->get_ike_version(peer_cfg) != IKEV1)
 	{	/* IKE_SA reuse disabled by config (not possible for IKEv1) */
-@@ -1567,6 +1585,15 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+@@ -1566,6 +1598,15 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
 			continue;
 		}
 
@@ -288,7 +495,7 @@ index 7763ae844e..cf53e9ae00 100644
 		current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
 		if (current_peer && current_peer->equals(current_peer, peer_cfg))
 		{
-@@ -1593,6 +1620,10 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+@@ -1592,6 +1633,10 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
 		{
 			ike_sa->set_peer_cfg(ike_sa, peer_cfg);
 			checkout_new(this, ike_sa);
@@ -299,16 +506,8 @@ index 7763ae844e..cf53e9ae00 100644
 		}
 	}
 	charon->bus->set_sa(charon->bus, ike_sa);
-@@ -2558,6 +2589,7 @@ ike_sa_manager_t *ike_sa_manager_create()
- 			.checkout = _checkout,
- 			.checkout_by_message = _checkout_by_message,
- 			.checkout_by_config = _checkout_by_config,
-+			.checkout_by_config2 = _checkout_by_config2,
- 			.checkout_by_id = _checkout_by_id,
- 			.checkout_by_name = _checkout_by_name,
- 			.new_initiator_spi = _new_initiator_spi,
 diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
-index 004cc22168..d001f5a802 100644
+index 004cc2216..56ef869be 100644
 --- a/src/libcharon/sa/ike_sa_manager.h
 +++ b/src/libcharon/sa/ike_sa_manager.h
@@ -123,7 +123,8 @@ struct ike_sa_manager_t {
@@ -321,37 +520,22 @@ index 004cc22168..d001f5a802 100644
 	 *
 	 * To initiate, a CHILD_SA may be established within an existing IKE_SA.
 	 * This call checks for an existing IKE_SA by comparing the configuration.
-@@ -140,6 +141,28 @@ struct ike_sa_manager_t {
- 	 */
- 	ike_sa_t *(*checkout_by_config)(ike_sa_manager_t* this, peer_cfg_t *peer_cfg);
- 
-+	/**
-+	 * Checkout an IKE_SA for initiation by a peer_config and optional
-+	 * source and remote host addresses.
-+	 *
-+	 * To initiate, a CHILD_SA may be established within an existing IKE_SA.
-+	 * This call checks for an existing IKE_SA by comparing the configuration.
-+	 * If the CHILD_SA can be created in an existing IKE_SA, the matching SA
-+	 * is returned.
-+	 * If no IKE_SA is found, a new one is created and registered in the
-+	 * manager. This is also the case when the found IKE_SA is in an unusable
-+	 * state (e.g. DELETING).
-+	 *
-+	 * @note The peer_config is always set on the returned IKE_SA.
-+	 *
-+	 * @param peer_cfg			configuration used to find an existing IKE_SA
+@@ -136,9 +137,12 @@ struct ike_sa_manager_t {
+ 	 * @note The peer_config is always set on the returned IKE_SA.
+ 	 *
+ 	 * @param peer_cfg			configuration used to find an existing IKE_SA
 +	 * @param my_host			source host address for wildcard peer_cfg
 +	 * @param other_host		remote host address for wildcard peer_cfg
-+	 * @return					checked out/created IKE_SA
-+	 */
-+	ike_sa_t *(*checkout_by_config2)(ike_sa_manager_t* this, peer_cfg_t *peer_cfg,
+ 	 * @return					checked out/created IKE_SA
+ 	 */
+-	ike_sa_t *(*checkout_by_config)(ike_sa_manager_t* this, peer_cfg_t *peer_cfg);
+	ike_sa_t *(*checkout_by_config)(ike_sa_manager_t* this, peer_cfg_t *peer_cfg,
 +									 host_t *my_host, host_t *other_host);
-+
+ 
 	/**
 	 * Reset initiator SPI.
- 	 *
 diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index 1b85c66a5b..bbc480c0cd 100644
+index d8d8a421a..f458ee0f1 100644
 --- a/src/libcharon/sa/trap_manager.c
 +++ b/src/libcharon/sa/trap_manager.c
@@ -523,7 +523,7 @@ METHOD(trap_manager_t, acquire, void,
@@ -360,10 +544,10 @@ index 1b85c66a5b..bbc480c0cd 100644
 	ike_sa_t *ike_sa;
 -	host_t *host;
 +	host_t *host, *my_host = NULL, *other_host = NULL;
- 	uint32_t allocated_reqid;
 	bool wildcard, ignore = FALSE;
 
-@@ -603,36 +603,26 @@ METHOD(trap_manager_t, acquire, void,
+ 	this->lock->read_lock(this->lock);
+@@ -600,36 +600,26 @@ METHOD(trap_manager_t, acquire, void,
 	this->lock->unlock(this->lock);
 
 	if (wildcard)
@@ -408,7 +592,7 @@ index 1b85c66a5b..bbc480c0cd 100644
 +		data->src->to_subnet(data->src, &my_host, &mask);
 +		my_host->set_port(my_host, port);
 	}
-+	ike_sa = charon->ike_sa_manager->checkout_by_config2(
+	ike_sa = charon->ike_sa_manager->checkout_by_config(
 +											charon->ike_sa_manager, peer,
 +											my_host, other_host);
 +	if (my_host) my_host->destroy(my_host);
@@ -417,16 +601,39 @@ index 1b85c66a5b..bbc480c0cd 100644
 
 	if (ike_sa)
 diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
-index e0fffb907d..c0fc8c5952 100644
+index e0fffb907..dcaded59d 100644
 --- a/src/swanctl/commands/initiate.c
 +++ b/src/swanctl/commands/initiate.c
-@@ -1,4 +1,5 @@
- /*
+@@ -14,6 +14,28 @@
+  * for more details.
+  */
+ 
+/*
 + * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-  * Copyright (C) 2014 Martin Willi
-  *
-  * Copyright (C) secunet Security Networks AG
-@@ -38,7 +39,7 @@ static int initiate(vici_conn_t *conn)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+ #include "command.h"
+ 
+ #include <errno.h>
+@@ -38,7 +60,7 @@ static int initiate(vici_conn_t *conn)
 	vici_req_t *req;
 	vici_res_t *res;
 	command_format_options_t format = COMMAND_FORMAT_NONE;
@@ -435,7 +642,7 @@ index e0fffb907d..c0fc8c5952 100644
 	int ret = 0, timeout = 0, level = 1;
 
 	while (TRUE)
-@@ -65,6 +66,12 @@ static int initiate(vici_conn_t *conn)
+@@ -65,6 +87,12 @@ static int initiate(vici_conn_t *conn)
 			case 'l':
 				level = atoi(arg);
 				continue;
@@ -448,7 +655,7 @@ index e0fffb907d..c0fc8c5952 100644
 			case EOF:
 				break;
 			default:
-@@ -88,6 +95,14 @@ static int initiate(vici_conn_t *conn)
+@@ -88,6 +116,14 @@ static int initiate(vici_conn_t *conn)
 	{
 		vici_add_key_valuef(req, "ike", "%s", ike);
 	}
@@ -463,7 +670,7 @@ index e0fffb907d..c0fc8c5952 100644
 	if (timeout)
 	{
 		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
-@@ -134,6 +149,8 @@ static void __attribute__ ((constructor))reg()
+@@ -134,6 +170,8 @@ static void __attribute__ ((constructor))reg()
 			{"help",		'h', 0, "show usage information"},
 			{"child",		'c', 1, "initiate a CHILD_SA configuration"},
 			{"ike",			'i', 1, "initiate an IKE_SA, or name of child's parent"},
@@ -473,5 +680,5 @@ index e0fffb907d..c0fc8c5952 100644
 			{"raw",			'r', 0, "dump raw response message"},
 			{"pretty",		'P', 0, "dump raw response message in pretty print"},
 -- 
-2.49.0
+2.41.0

--- a/0002-vici-send-certificates-for-ike-sa-events.patch
+++ b/0002-vici-send-certificates-for-ike-sa-events.patch
@@ -1,7 +1,7 @@
-From f6210f6ab72ead26a24a8f231eee67948d3ca543 Mon Sep 17 00:00:00 2001
+From 0a1ee45f16f61cb68f526aeacd58ed275e7d8c48 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Mon, 21 Sep 2015 13:42:05 +0300
-Subject: [PATCH 2/4] vici: send certificates for ike-sa events
+Subject: [PATCH 2/3] vici: send certificates for ike-sa events
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
 1 file changed, 42 insertions(+), 8 deletions(-)

 diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index bacb7b101e..19acc0789b 100644
+index bacb7b101..19acc0789 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
@@ -402,7 +402,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
@@ -136,5 +136,5 @@ index bacb7b101e..19acc0789b 100644
 
 	b->begin_section(b, old->get_name(old));
 -- 
-2.49.0
+2.41.0

--- a/0003-vici-add-support-for-individual-sa-state-changes.patch
+++ b/0003-vici-add-support-for-individual-sa-state-changes.patch
@@ -1,7 +1,7 @@
-From effc140ed0ed5c7f1897c8abb6364d2d4789a4ee Mon Sep 17 00:00:00 2001
+From 39f70df4d1846f9044c270fa8cb6149d42067736 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Mon, 21 Sep 2015 13:42:11 +0300
-Subject: [PATCH 3/4] vici: add support for individual sa state changes
+Subject: [PATCH 3/3] vici: add support for individual sa state changes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
 1 file changed, 106 insertions(+)

 diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 19acc0789b..fa1aca9536 100644
+index 19acc0789..fa1aca953 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
@@ -1774,8 +1774,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
@@ -156,5 +156,5 @@ index 19acc0789b..fa1aca9536 100644
 			.destroy = _destroy,
 		},
 -- 
-2.49.0
+2.41.0

--- a/0004-Support-GRE-key-in-selectors-with-kernel-netlink.patch
+++ b/0004-Support-GRE-key-in-selectors-with-kernel-netlink.patch
@@ -1,286 +0,0 @@
-From 7f32aed540533e50fa05486df471ef3c19879324 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zoran.pericic@infomaas.com>
-Date: Sun, 21 Jan 2024 03:11:32 +0100
-Subject: [PATCH 4/4] Support GRE key in selectors with kernel-netlink.
-
-Implementation use two 2-byte port fields (from/to range) to store key
-similar to ICMP.
---
- .../kernel_netlink/kernel_netlink_ipsec.c     | 19 +++++++++++++
- .../plugins/load_tester/load_tester_config.c  | 22 ++++++++++++++-
- src/libcharon/plugins/stroke/stroke_config.c  | 22 ++++++++++++++-
- src/libcharon/plugins/vici/vici_config.c      | 27 ++++++++++++++++++-
- .../selectors/traffic_selector.c              | 20 ++++++++++++++
- .../selectors/traffic_selector.h              | 12 +++++++++
- src/starter/confread.c                        | 24 ++++++++++++++++-
- src/swanctl/swanctl.opt                       |  3 +++
- 8 files changed, 145 insertions(+), 4 deletions(-)
-
-diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-index db0b2ac37a..d4f9571817 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-@@ -864,6 +864,7 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src,
- {
- 	struct xfrm_selector sel;
- 	uint16_t port;
-+	uint32_t gre_key;
- 
- 	memset(&sel, 0, sizeof(sel));
- 	sel.family = (src->get_type(src) == TS_IPV4_ADDR_RANGE) ? AF_INET : AF_INET6;
-@@ -884,6 +885,24 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src,
- 		sel.dport = htons(traffic_selector_icmp_code(port));
- 		sel.dport_mask = sel.dport ? ~0 : 0;
- 	}
-+	if (sel.proto == IPPROTO_GRE)
-+	{
-+		/* the kernel expects the GRE key in the source and destination
-+		 * port fields, respectively. */
-+		gre_key = htons(traffic_selector_gre_key(dst->get_from_port(dst), dst->get_to_port(dst)));
-+		if ( gre_key != 0 )
-+		{
-+			sel.sport = gre_key >> 16;
-+			sel.sport_mask = ~0;
-+			sel.dport = gre_key & 0xffff;
-+			sel.dport_mask = ~0;
-+		} else {
-+			sel.sport = 0;
-+			sel.sport_mask = 0;
-+			sel.dport = 0;
-+			sel.dport_mask = 0;
-+		}
-+	}
- 	sel.ifindex = interface ? if_nametoindex(interface) : 0;
- 	sel.user = 0;
- 
-diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
-index 58e1cd98a0..f20fdae522 100644
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
-+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
-@@ -498,7 +498,27 @@ static bool parse_protoport(char *token, uint16_t *from_port,
- 			*protocol = (uint8_t)p;
- 		}
- 	}
-	if (streq(port, "%any"))
-+	if (*protocol == IPPROTO_GRE)
-+	{
-+		if (*port && !streq(port, "%any"))
-+		{
-+			p = strtol(port, &endptr, 0);
-+			if (p < 0 || p > 0xffffffff)
-+			{
-+				return FALSE;
-+			}
-+			*from_port = (p >> 16) & 0xffff;
-+			*to_port = p & 0xffff;
-+			if (*endptr)
-+			{
-+				return FALSE;
-+			}
-+		} else {
-+			*from_port = 0;
-+			*to_port = 0;
-+		}
-+	}
-+	else if (streq(port, "%any"))
- 	{
- 		*from_port = 0;
- 		*to_port = 0xffff;
-diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
-index 55db379ffe..b4340b8d1b 100644
--- a/src/libcharon/plugins/stroke/stroke_config.c
-+++ b/src/libcharon/plugins/stroke/stroke_config.c
-@@ -927,7 +927,27 @@ static bool parse_protoport(char *token, uint16_t *from_port,
- 			*protocol = (uint8_t)p;
- 		}
- 	}
-	if (streq(port, "%any"))
-+	if (*protocol == IPPROTO_GRE)
-+	{
-+		if (*port && !streq(port, "%any"))
-+		{
-+			p = strtol(port, &endptr, 0);
-+			if (p < 0 || p > 0xffffffff)
-+			{
-+				return FALSE;
-+			}
-+			*from_port = (p >> 16) & 0xffff;
-+			*to_port = p & 0xffff;
-+			if (*endptr)
-+				return FALSE;
-+		}
-+		else
-+		{
-+			*from_port = 0;
-+			*to_port = 0;
-+		}
-+	}
-+	else if (streq(port, "%any"))
- 	{
- 		*from_port = 0;
- 		*to_port = 0xffff;
-diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
-index c858e9945c..24a254689b 100644
--- a/src/libcharon/plugins/vici/vici_config.c
-+++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -715,7 +715,27 @@ CALLBACK(parse_ts, bool,
- 				proto = (uint8_t)p;
- 			}
- 		}
-		if (streq(port, "opaque"))
-+		if (proto == IPPROTO_GRE)
-+		{
-+			if (*port && !streq(port, "any"))
-+			{
-+				p = strtol(port, &end, 0);
-+				if (p < 0 || p > 0xffffffff)
-+				{
-+					return FALSE;
-+				}
-+				from = (p >> 16) & 0xffff;
-+				to = p & 0xffff;
-+				if (*end)
-+				{
-+					return FALSE;
-+				}
-+			} else {
-+				from = 0;
-+				to = 0;
-+			}
-+		}
-+		else if (streq(port, "opaque"))
- 		{
- 			from = 0xffff;
- 			to = 0;
-@@ -752,6 +772,11 @@ CALLBACK(parse_ts, bool,
- 			}
- 		}
- 	}
-+	else if (proto == IPPROTO_GRE)
-+	{
-+		from = 0;
-+		to = 0;
-+	}
- 	if (streq(buf, "dynamic"))
- 	{
- 		ts = traffic_selector_create_dynamic(proto, from, to);
-diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c
-index fe61e3768b..09757ec36f 100644
--- a/src/libstrongswan/selectors/traffic_selector.c
-+++ b/src/libstrongswan/selectors/traffic_selector.c
-@@ -205,6 +205,18 @@ 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_gre(printf_hook_data_t *data, uint16_t from_port, uint16_t to_port)
-+{
-+	uint32_t gre_key;
-+
-+	gre_key = traffic_selector_gre_key(from_port, to_port);
-+
-+	return print_in_hook(data, "%d", gre_key);
-+}
-+
- /**
-  * Described in header.
-  */
-@@ -319,6 +331,10 @@ int traffic_selector_printf_hook(printf_hook_data_t *data,
- 			{
- 				written += print_icmp(data, this->from_port);
- 			}
-+			else if (this->protocol == IPPROTO_GRE)
-+			{
-+				written += print_gre(data, this->from_port, this->to_port);
-+			}
- 			else
- 			{
- 				serv = getservbyport(htons(this->from_port), serv_proto);
-@@ -332,6 +348,10 @@ int traffic_selector_printf_hook(printf_hook_data_t *data,
- 				}
- 			}
- 		}
-+		else if (this->protocol == IPPROTO_GRE)
-+		{
-+			written += print_gre(data, this->from_port, this->to_port);
-+		}
- 		else if (is_opaque(this))
- 		{
- 			written += print_in_hook(data, "OPAQUE");
-diff --git a/src/libstrongswan/selectors/traffic_selector.h b/src/libstrongswan/selectors/traffic_selector.h
-index 367b4fff94..b7010e4a73 100644
--- a/src/libstrongswan/selectors/traffic_selector.h
-+++ b/src/libstrongswan/selectors/traffic_selector.h
-@@ -272,6 +272,18 @@ static inline uint8_t traffic_selector_icmp_code(uint16_t port)
- 	return port & 0xff;
- }
- 
-+/**
-+ * Extract the GRE key from a source and destination port in host order
-+ *
-+ * @param from_port		port number in host order
-+ * @param to_port		port number in host order
-+ * @return				GRE key
-+ */
-+static inline uint8_t traffic_selector_gre_key(uint16_t from_port, uint16_t to_port)
-+{
-+	return (from_port & 0xffff) << 16 | (to_port & 0xffff);
-+}
-+
- /**
-  * Compare two traffic selectors, usable as sort function
-  *
-diff --git a/src/starter/confread.c b/src/starter/confread.c
-index 5065bc369f..039b6f402b 100644
--- a/src/starter/confread.c
-+++ b/src/starter/confread.c
-@@ -325,7 +325,29 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
- 					end->protocol = (uint8_t)p;
- 				}
- 			}
-			if (streq(port, "%any"))
-+			if (end->protocol == IPPROTO_GRE)
-+			{
-+				if (*port && !streq(port, "%any"))
-+				{
-+					p = strtol(port, &endptr, 0);
-+					if (p < 0 || p > 0xffffffff)
-+					{
-+						DBG1(DBG_APP, "# bad GRE key: %s=%s", key, port);
-+						goto err;
-+					}
-+					end->from_port = (p >> 16) & 0xffff;
-+					end->to_port = p & 0xffff;
-+					if (*endptr)
-+					{
-+						DBG1(DBG_APP, "# bad GRE key: %s=%s", key, port);
-+						goto err;
-+					}
-+				} else {
-+					end->from_port = 0;
-+					end->to_port = 0;
-+				}
-+			}
-+			else if (streq(port, "%any"))
- 			{
- 				end->from_port = 0;
- 				end->to_port = 0xffff;
-diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
-index d9fd949ed1..1d63dadb89 100644
--- a/src/swanctl/swanctl.opt
-+++ b/src/swanctl/swanctl.opt
-@@ -765,6 +765,9 @@ connections.<conn>.children.<child>.local_ts = dynamic
- 	value _opaque_ for RFC 4301 OPAQUE selectors. Port ranges may be specified
- 	as well, none of the kernel backends currently support port ranges, though.
- 
-+	If protocol is restricted to GRE, port restriction specifies GRE key
-+	in 32 bit numeric form eg. dynamic[gre/100].
-+
- 	When IKEv1 is used only the first selector is interpreted, except if
- 	the Cisco Unity extension plugin is used. This is due to a limitation of the
- 	IKEv1 protocol, which only allows a single pair of selectors per CHILD_SA.
-- 
-2.49.0
-
--- a/0004-Support-GRE-key-in-selectors.patch
+++ b/0004-Support-GRE-key-in-selectors.patch
@@ -0,0 +1,258 @@
+From 027c90f6808d451f3bbcd4b2dc4b8ad04806dc64 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zoran.pericic@infomaas.com>
+Date: Sun, 21 Jan 2024 03:11:32 +0100
+Subject: [PATCH 4/4] Support GRE key in selectors.
+
+---
+ .../kernel_netlink/kernel_netlink_ipsec.c     | 12 +++++++++++
+ .../plugins/load_tester/load_tester_config.c  | 16 ++++++++++++++
+ src/libcharon/plugins/stroke/stroke_config.c  | 15 +++++++++++++
+ src/libcharon/plugins/vici/vici_config.c      | 21 ++++++++++++++++++-
+ .../selectors/traffic_selector.c              | 20 ++++++++++++++++++
+ .../selectors/traffic_selector.h              | 12 +++++++++++
+ src/starter/confread.c                        | 18 ++++++++++++++++
+ 7 files changed, 113 insertions(+), 1 deletion(-)
+
+diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+index 7596f0c18..fdfc9d51e 100644
+--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+@@ -864,6 +864,7 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src,
+ {
+ 	struct xfrm_selector sel;
+ 	uint16_t port;
+	uint32_t gre_key;
+ 
+ 	memset(&sel, 0, sizeof(sel));
+ 	sel.family = (src->get_type(src) == TS_IPV4_ADDR_RANGE) ? AF_INET : AF_INET6;
+@@ -884,6 +885,17 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src,
+ 		sel.dport = htons(traffic_selector_icmp_code(port));
+ 		sel.dport_mask = sel.dport ? ~0 : 0;
+ 	}
+	if (sel.proto == IPPROTO_GRE)
+	{
+		/* the kernel expects the GRE key in the source and destination
+		 * port fields, respectively. */
+		gre_key = htons(traffic_selector_gre_key(dst->get_from_port(dst), dst->get_to_port(dst)));
+		DBG2(DBG_KNL, "Policy GRE key: %d (%d-%d) %d", gre_key, dst->get_from_port(dst), dst->get_to_port(dst), traffic_selector_gre_key(dst->get_from_port(dst), dst->get_to_port(dst)));
+		sel.sport = gre_key >> 16;
+		sel.sport_mask = ~0;
+		sel.dport = gre_key & 0xffff;
+		sel.dport_mask = ~0;
+	}
+ 	sel.ifindex = interface ? if_nametoindex(interface) : 0;
+ 	sel.user = 0;
+ 
+diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
+index 58e1cd98a..436116361 100644
+--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
+@@ -16,6 +16,8 @@
+ 
+ #include "load_tester_config.h"
+ 
+#include <utils/utils.h>
+
+ #include <netdb.h>
+ 
+ #include <daemon.h>
+@@ -512,6 +514,20 @@ static bool parse_protoport(char *token, uint16_t *from_port,
+ 	{
+ 		*from_port = *to_port = 0;
+ 	}
+	else if (*port && *protocol == IPPROTO_GRE)
+	{
+		p = strtol(port, &endptr, 0);
+		if (p < 0 || p > 0xffffffff)
+		{
+			return FALSE;
+		}
+		end->from_port = (p >> 16) & 0xffff;
+		end->to_port = p & 0xffff;
+		if (*endptr)
+		{
+			return FALSE;
+		}
+	}
+ 	else if (*port)
+ 	{
+ 		svc = getservbyname(port, NULL);
+diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
+index 55db379ff..9ee4c6463 100644
+--- a/src/libcharon/plugins/stroke/stroke_config.c
+++ b/src/libcharon/plugins/stroke/stroke_config.c
+@@ -20,6 +20,7 @@
+ #include <daemon.h>
+ #include <threading/mutex.h>
+ #include <utils/lexparser.h>
+#include <utils/utils.h>
+ 
+ #include <netdb.h>
+ 
+@@ -937,6 +938,20 @@ 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);
+		if (p < 0 || p > 0xffffffff)
+		{
+			return FALSE;
+		}
+		*from_port = (p >> 16) & 0xffff;
+		*to_port = p & 0xffff;
+		if (*endptr)
+		{
+			return FALSE;
+		}
+	}
+ 	else if (*port)
+ 	{
+ 		svc = getservbyname(port, NULL);
+diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
+index b1486e337..35c4df1b0 100644
+--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
+@@ -718,7 +718,25 @@ CALLBACK(parse_ts, bool,
+ 			from = 0xffff;
+ 			to = 0;
+ 		}
+-		else if (*port && !streq(port, "any"))
+		else if (*port && !streq(port, "any") && proto == IPPROTO_GRE)
+		{
+			DBG2(DBG_CFG, "   GRE key %s", port);
+			p = strtol(port, &end, 0);
+			if (p < 0 || p > 0xffffffff)
+			{
+				DBG2(DBG_CFG, "   Invalid GRE key %s", port);
+				return FALSE;
+			}
+			from = (p >> 16) & 0xffff;
+			to = p & 0xffff;
+			DBG2(DBG_CFG, "   Parsed GRE key %d-%d(%d)", from, to, p);
+			if (*end)
+			{
+				DBG2(DBG_CFG, "   Invalid GRE key %s", port);
+				return FALSE;
+			}
+		}
+		else if (*port && !streq(port, "any") && proto != IPPROTO_GRE)
+ 		{
+ 			svc = getservbyname(port, NULL);
+ 			if (svc)
+@@ -752,6 +770,7 @@ CALLBACK(parse_ts, bool,
+ 	}
+ 	if (streq(buf, "dynamic"))
+ 	{
+		DBG2(DBG_CFG, "   Create dynamic selector GRE key proto=%d, from_port=%d, to_port=%d", proto, from, to);
+ 		ts = traffic_selector_create_dynamic(proto, from, to);
+ 	}
+ 	else if (strchr(buf, '-'))
+diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c
+index fe61e3768..29ffbffbd 100644
+--- a/src/libstrongswan/selectors/traffic_selector.c
+++ b/src/libstrongswan/selectors/traffic_selector.c
+@@ -205,6 +205,18 @@ 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_gre(printf_hook_data_t *data, uint16_t from_port, uint16_t to_port)
+{
+	uint32_t gre_key;
+
+	gre_key = traffic_selector_gre_key(from_port, to_port);
+
+	return print_in_hook(data, "%d", gre_key);
+}
+
+ /**
+  * Described in header.
+  */
+@@ -319,6 +331,10 @@ int traffic_selector_printf_hook(printf_hook_data_t *data,
+ 			{
+ 				written += print_icmp(data, this->from_port);
+ 			}
+			else if (this->protocol == IPPROTO_GRE)
+			{
+				written += print_gre(data, this->from_port, this->to_port);
+			}
+ 			else
+ 			{
+ 				serv = getservbyport(htons(this->from_port), serv_proto);
+@@ -343,6 +359,10 @@ int traffic_selector_printf_hook(printf_hook_data_t *data,
+ 			written += print_in_hook(data, "-");
+ 			written += print_icmp(data, this->to_port);
+ 		}
+		else if (this->protocol == IPPROTO_GRE)
+		{
+			written += print_gre(data, this->from_port, this->to_port);
+		}
+ 		else
+ 		{
+ 			written += print_in_hook(data, "%d-%d",
+diff --git a/src/libstrongswan/selectors/traffic_selector.h b/src/libstrongswan/selectors/traffic_selector.h
+index 367b4fff9..b7010e4a7 100644
+--- a/src/libstrongswan/selectors/traffic_selector.h
+++ b/src/libstrongswan/selectors/traffic_selector.h
+@@ -272,6 +272,18 @@ static inline uint8_t traffic_selector_icmp_code(uint16_t port)
+ 	return port & 0xff;
+ }
+ 
+/**
+ * Extract the GRE key from a source and destination port in host order
+ *
+ * @param from_port		port number in host order
+ * @param to_port		port number in host order
+ * @return				GRE key
+ */
+static inline uint8_t traffic_selector_gre_key(uint16_t from_port, uint16_t to_port)
+{
+	return (from_port & 0xffff) << 16 | (to_port & 0xffff);
+}
+
+ /**
+  * Compare two traffic selectors, usable as sort function
+  *
+diff --git a/src/starter/confread.c b/src/starter/confread.c
+index 5065bc369..e2c03694d 100644
+--- a/src/starter/confread.c
+++ b/src/starter/confread.c
+@@ -25,6 +25,7 @@
+ 
+ #include <library.h>
+ #include <utils/debug.h>
+#include <utils/utils.h>
+ 
+ #include "keywords.h"
+ #include "confread.h"
+@@ -335,6 +336,23 @@ static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
+ 				end->from_port = 0xffff;
+ 				end->to_port = 0;
+ 			}
+			else if (*port && end->protocol == IPPROTO_GRE)
+			{
+				DBG1(DBG_APP, "# GRE key: %s=%s", key, port);
+				p = strtol(port, &endptr, 0);
+				if (p < 0 || p > 0xffffffff)
+				{
+					DBG1(DBG_APP, "# bad GRE key: %s=%s", key, port);
+					goto err;
+				}
+				end->from_port = (p >> 16) & 0xffff;
+				end->to_port = p & 0xffff;
+				if (*endptr)
+				{
+					DBG1(DBG_APP, "# bad GRE key: %s=%s", key, port);
+					goto err;
+				}
+			}
+ 			else if (*port)
+ 			{
+ 				svc = getservbyname(port, NULL);
+-- 
+2.43.0
+
--- a/4
+++ b/4
@@ -1,2 +1,2 @@
-SHA512 (strongswan-5.9.14.tar.bz2) = e48bc9d215f9de6b54e24f7b4765d59aec4c615291d5c1f24f6a6d7da45dc8b17b2e0e150faf5fabb35e5d465abc5e6f6efa06cd002467067c5d7844ead359f6
-SHA512 (strongswan-5.9.14.tar.bz2.sig) = 1b3d57448caab91060fe3d209d90708c57dbf35ae62c97574107b32677cff73f13f7545dc91682ef84400bb8a2f105a1761aba8334763dc8c35d97be7921c242
+SHA512 (strongswan-5.9.11.tar.bz2) = d500523215f5ec5c5550c4d2c49060b350ae396d8c60170792c46775d04fc7a132aa70a6242145477753668351d26ed957e08903683ecc340aa8d84fb2ae5498
+SHA512 (strongswan-5.9.11.tar.bz2.sig) = a434dc338641c808d3461de17c893a0d3b761cdba6cea5db0551fc75df498cfae26db379a86fd2a0a0e7710676a1cd657c01da435054a6814ec4ce6099db2b68
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -16,11 +16,10 @@
 %global forgeurl0 https://github.com/strongswan/strongswan

 Name:           strongswan
-Version:        5.9.14
-Release:        5%{?dist}
+Version:        5.9.11
+Release:        3%{?dist}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            https://www.strongswan.org/
 VCS:            git:%{forgeurl0}
 Source0:        https://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2
@@ -34,7 +33,7 @@ Patch1:         strongswan-5.9.7-error-no-format.patch
 Patch10:        0001-charon-add-optional-source-and-remote-overrides-for-.patch
 Patch11:        0002-vici-send-certificates-for-ike-sa-events.patch
 Patch12:        0003-vici-add-support-for-individual-sa-state-changes.patch
-Patch13:        0004-Support-GRE-key-in-selectors-with-kernel-netlink.patch
+Patch13:        0004-Support-GRE-key-in-selectors.patch

 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -48,10 +47,6 @@ BuildRequires:  gmp-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
-%if 0%{?fedora} >= 41
-# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine
-BuildRequires:  openssl-devel-engine
-%endif
 BuildRequires:  sqlite-devel
 BuildRequires:  gettext-devel
 BuildRequires:  libxml2-devel
@@ -427,24 +422,6 @@ install -D -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/strongswan-starter.co
 %endif

 %changelog
-* Sat Jul 27 2024 Michel Lind <salimma@fedoraproject.org> - 5.9.14-5
- Depend on openssl-devel-engine since we still use this deprecated feature (rhbz#2295335)
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 5.9.14-4
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 5.9.14-2
- Rebuilt for Python 3.13
-
-* Fri May 31 2024 Paul Wouters <paul.wouters@aiven.io> - 5.9.14-1
- Resolves: rhbz#2254560 CVE-2023-41913 buffer overflow and possible RCE
- Resolved: rhbz#2250666 Update to 5.9.14 (IKEv2 OCSP extensions, seqno/regno overflow handling
- Update to 5.9.13 (OCSP nonce set regression configuration option charon.ocsp_nonce_len)
- Update to 5.9.12 (CVE-2023-41913 fix, various IKEv2 fixes)
-
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Author	SHA1	Message	Date
Zoran Peričić	f975bfb84f	Support GRE key in selectors	2024-05-19 20:39:30 +02:00
Zoran Peričić	d423b730e9	Patch vici for NHRP	2024-05-19 20:39:30 +02:00