Support GRE key in selectors

Patch vici for NHRP
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
2024-05-19 20:39:30 +02:00 · 2024-05-19 20:39:30 +02:00 · 2024-01-27 04:30:59 +00:00 · 2023-07-22 02:39:37 +00:00 · 2023-07-17 17:14:14 -04:00 · 2023-07-14 13:45:25 -04:00
11 changed files with 460 additions and 250 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,11 @@
 /strongswan-5.9.5.tar.bz2.sig
 /strongswan-5.9.6.tar.bz2
 /strongswan-5.9.6.tar.bz2.sig
+/strongswan-5.9.8.tar.bz2
+/strongswan-5.9.8.tar.bz2.sig
+/strongswan-5.9.9.tar.bz2
+/strongswan-5.9.9.tar.bz2.sig
+/strongswan-5.9.10.tar.bz2
+/strongswan-5.9.10.tar.bz2.sig
+/strongswan-5.9.11.tar.bz2
+/strongswan-5.9.11.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,4 +1,4 @@
-From 84b1ee5c075b731618ff342ba4df94c3f9f2eaef Mon Sep 17 00:00:00 2001
+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
@@ -19,42 +19,42 @@ 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.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  |  3 +-
+ 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       |  1 +
+ src/libcharon/plugins/uci/uci_control.c       |  3 +-
 src/libcharon/plugins/vici/vici_config.c      |  2 +-
- src/libcharon/plugins/vici/vici_control.c     | 61 ++++++++++++++++---
+ 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, 226 insertions(+), 50 deletions(-)
+ 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 37d951951..d91eb951c 100644
+index 2e2cb3ca2..b9369a8a2 100644
 --- a/src/charon-cmd/cmd/cmd_connection.c
 +++ b/src/charon-cmd/cmd/cmd_connection.c
-@@ -440,7 +440,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this)
+@@ -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, 0, FALSE) != SUCCESS)
-+								NULL, NULL, controller_cb_empty, NULL, 0, FALSE) != SUCCESS)
+-				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 09107a76b..0b15a1835 100644
+index 7f88514a7..4c3491984 100644
 --- a/src/charon-nm/nm/nm_service.c
 +++ b/src/charon-nm/nm/nm_service.c
-@@ -883,7 +883,7 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
+@@ -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,
@@ -64,20 +64,20 @@ index 09107a76b..0b15a1835 100644
 	if (!ike_sa)
 	{
 diff --git a/src/conftest/actions.c b/src/conftest/actions.c
-index 66e41f743..64ef8e9ee 100644
+index b6b186117..21e329e3e 100644
 --- a/src/conftest/actions.c
 +++ b/src/conftest/actions.c
-@@ -65,7 +65,7 @@ static job_requeue_t initiate(char *config)
+@@ -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, FALSE);
-+									 NULL, NULL, NULL, NULL, 0, FALSE);
+-									 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 cd25b28fe..36d6cd7be 100644
+index 027f48e93..9109b20e4 100644
 --- a/src/libcharon/control/controller.c
 +++ b/src/libcharon/control/controller.c
@@ -15,6 +15,28 @@
@@ -109,7 +109,7 @@ index cd25b28fe..36d6cd7be 100644
 #include "controller.h"
 
 #include <sys/types.h>
-@@ -102,6 +124,16 @@ struct interface_listener_t {
+@@ -107,6 +129,16 @@ struct interface_listener_t {
 	 */
 	ike_sa_t *ike_sa;
 
@@ -126,7 +126,7 @@ index cd25b28fe..36d6cd7be 100644
 	/**
 	 * unique ID, used for various methods
 	 */
-@@ -414,10 +446,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;
@@ -144,15 +144,15 @@ index cd25b28fe..36d6cd7be 100644
 	if (!ike_sa)
 	{
 		DESTROY_IF(listener->child_cfg);
-@@ -492,6 +530,7 @@ METHOD(job_t, initiate_execute, job_requeue_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, u_int timeout, bool limits)
+ 	controller_cb_t callback, void *param, level_t max_level, u_int timeout,
+ 	bool limits)
 {
- 	interface_job_t *job;
-@@ -514,6 +553,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,
@@ -162,10 +162,10 @@ index cd25b28fe..36d6cd7be 100644
 			.options.limits = limits,
 		},
 diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
-index b4ccfced2..7a088b122 100644
+index 36a1d4631..a130fbb6b 100644
 --- a/src/libcharon/control/controller.h
 +++ b/src/libcharon/control/controller.h
-@@ -79,6 +79,8 @@ 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
@@ -173,120 +173,121 @@ index b4ccfced2..7a088b122 100644
 +	 * @param other_host		optional address hint for destination
 	 * @param cb			logging callback
 	 * @param param			parameter to include in each call of cb
- 	 * @param timeout		timeout in ms to wait for callbacks, 0 to disable
-@@ -92,6 +94,7 @@ struct controller_t {
+ 	 * @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, u_int timeout,
- 						 bool limits);
+ 						 controller_cb_t callback, void *param,
+ 						 level_t max_level, u_int timeout, bool limits);
 
 diff --git a/src/libcharon/plugins/load_tester/load_tester_control.c b/src/libcharon/plugins/load_tester/load_tester_control.c
-index 8e89ab435..9dfd415ca 100644
+index b5356289a..ddef85b4a 100644
 --- a/src/libcharon/plugins/load_tester/load_tester_control.c
 +++ b/src/libcharon/plugins/load_tester/load_tester_control.c
-@@ -239,6 +239,7 @@ static bool on_accept(private_load_tester_control_t *this, stream_t *io)
+@@ -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, 0, FALSE))
+ 							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 961c10406..f59294d88 100644
+index 695e75b83..e3f740281 100644
 --- a/src/libcharon/plugins/load_tester/load_tester_plugin.c
 +++ b/src/libcharon/plugins/load_tester/load_tester_plugin.c
-@@ -151,6 +151,7 @@ static job_requeue_t do_load_test(private_load_tester_plugin_t *this)
+@@ -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, FALSE);
+ 					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 e88c11d3a..d4ce4f203 100644
+index 3211a49f1..f98b3eac8 100644
 --- a/src/libcharon/plugins/medcli/medcli_config.c
 +++ b/src/libcharon/plugins/medcli/medcli_config.c
-@@ -349,7 +349,8 @@ static job_requeue_t initiate_config(peer_cfg_t *peer_cfg)
+@@ -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, FALSE);
-+									 peer_cfg, child_cfg, NULL, NULL,
-+									 NULL, NULL, 0, FALSE);
+ 		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 2953a603b..f028406fb 100644
+index 91dddfeaa..1e9326822 100644
 --- a/src/libcharon/plugins/smp/smp.c
 +++ b/src/libcharon/plugins/smp/smp.c
-@@ -493,7 +493,8 @@ static void request_control_initiate(xmlTextReaderPtr reader,
+@@ -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, 0, FALSE);
+ 							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 8d84b934e..b00d0e62d 100644
+index 2824c93cb..21ff6b31f 100644
 --- a/src/libcharon/plugins/stroke/stroke_control.c
 +++ b/src/libcharon/plugins/stroke/stroke_control.c
-@@ -108,7 +108,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
+@@ -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, FALSE);
-+									 NULL, NULL, NULL, NULL, 0, FALSE);
+-									 NULL, NULL, 0, 0, FALSE);
+									 NULL, NULL, NULL, NULL, 0, 0, FALSE);
 	}
 	else
 	{
-@@ -116,7 +116,8 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
+@@ -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, this->timeout, FALSE);
+ 							&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 b6cfda082..115e0a82e 100644
+index b033c832c..f8d1be745 100644
 --- a/src/libcharon/plugins/uci/uci_control.c
 +++ b/src/libcharon/plugins/uci/uci_control.c
-@@ -147,6 +147,7 @@ static void initiate(private_uci_control_t *this, char *name)
+@@ -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),
-+								NULL, NULL,
- 								controller_cb_empty, NULL, 0, FALSE) == SUCCESS)
+-							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 3a783b822..ea9a5c6b2 100644
+index 522122562..b1486e337 100644
 --- a/src/libcharon/plugins/vici/vici_config.c
 +++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -2216,7 +2216,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
+@@ -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, FALSE);
-+					NULL, NULL, NULL, NULL, 0, FALSE);
+-					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 4c09b578d..4c00c2be5 100644
+index 1c236d249..b3a76efa2 100644
 --- a/src/libcharon/plugins/vici/vici_control.c
 +++ b/src/libcharon/plugins/vici/vici_control.c
-@@ -16,6 +16,28 @@
+@@ -15,6 +15,28 @@
  * for more details.
  */
 
@@ -315,7 +316,7 @@ index 4c09b578d..4c00c2be5 100644
 #include "vici_control.h"
 #include "vici_builder.h"
 
-@@ -174,9 +196,12 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
+@@ -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)
 {
@@ -328,7 +329,7 @@ index 4c09b578d..4c00c2be5 100644
 	int timeout;
 	bool limits;
 	controller_cb_t log_cb = NULL;
-@@ -190,6 +215,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");
@@ -337,7 +338,7 @@ index 4c09b578d..4c00c2be5 100644
 
 	if (!child && !ike)
 	{
-@@ -203,28 +230,48 @@ CALLBACK(initiate, vici_message_t*,
+@@ -202,28 +229,48 @@ CALLBACK(initiate, vici_message_t*,
 	type = child ? "CHILD_SA" : "IKE_SA";
 	sa = child ?: ike;
 
@@ -361,10 +362,9 @@ index 4c09b578d..4c00c2be5 100644
 +		msg = send_reply(this, "%s config '%s' not found", type, sa);
 +		goto ret;
 	}
- 	switch (charon->controller->initiate(charon->controller, peer_cfg,
-									child_cfg, log_cb, &log, timeout, limits))
-+				 child_cfg, my_host, other_host,
-+				log_cb, &log, timeout, limits))
+ 	switch (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+										 my_host, other_host,
+ 										 log_cb, &log, log.level, timeout, limits))
 	{
 		case SUCCESS:
 -			return send_reply(this, NULL);
@@ -392,37 +392,37 @@ index 4c09b578d..4c00c2be5 100644
 +	return msg;
 }
 
- CALLBACK(terminate, vici_message_t*,
+ /**
 diff --git a/src/libcharon/processing/jobs/initiate_mediation_job.c b/src/libcharon/processing/jobs/initiate_mediation_job.c
-index 6a72499d3..eb0ad3846 100644
+index ed493bc76..9a1cdcda4 100644
 --- a/src/libcharon/processing/jobs/initiate_mediation_job.c
 +++ b/src/libcharon/processing/jobs/initiate_mediation_job.c
-@@ -137,6 +137,7 @@ METHOD(job_t, initiate, job_requeue_t,
+@@ -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, 0, FALSE) != SUCCESS)
+							NULL, NULL,
+ 							(controller_cb_t)initiate_callback, this, LEVEL_CTRL,
+ 							0, FALSE) != SUCCESS)
 		{
- 			mediation_cfg->destroy(mediation_cfg);
 diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
-index 31e154a77..0371293b1 100644
+index 122e5cee9..dec458c84 100644
 --- a/src/libcharon/processing/jobs/start_action_job.c
 +++ b/src/libcharon/processing/jobs/start_action_job.c
-@@ -83,7 +83,7 @@ METHOD(job_t, execute, job_requeue_t,
+@@ -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, FALSE);
-+											 NULL, NULL, NULL, NULL, 0, FALSE);
+-											 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 fe615a6bc..5839f8827 100644
+index fc31c2a7c..0836b8c78 100644
 --- a/src/libcharon/sa/ike_sa_manager.c
 +++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -17,6 +17,28 @@
+@@ -16,6 +16,28 @@
  * for more details.
  */
 
@@ -451,7 +451,7 @@ index fe615a6bc..5839f8827 100644
 #include <string.h>
 #include <inttypes.h>
 
-@@ -1495,7 +1517,8 @@ typedef struct {
+@@ -1497,7 +1519,8 @@ typedef struct {
 } config_entry_t;
 
 METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
@@ -461,7 +461,7 @@ index fe615a6bc..5839f8827 100644
 {
 	enumerator_t *enumerator;
 	entry_t *entry;
-@@ -1506,7 +1529,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;
 
@@ -479,7 +479,7 @@ index fe615a6bc..5839f8827 100644
 
 	if (!this->reuse_ikesa && peer_cfg->get_ike_version(peer_cfg) != IKEV1)
 	{	/* IKE_SA reuse disabled by config (not possible for IKEv1) */
-@@ -1564,6 +1596,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;
 		}
 
@@ -495,7 +495,7 @@ index fe615a6bc..5839f8827 100644
 		current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
 		if (current_peer && current_peer->equals(current_peer, peer_cfg))
 		{
-@@ -1590,6 +1631,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);
@@ -507,10 +507,10 @@ index fe615a6bc..5839f8827 100644
 	}
 	charon->bus->set_sa(charon->bus, ike_sa);
 diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
-index d87ba2d68..ba4f2c7e7 100644
+index 004cc2216..56ef869be 100644
 --- a/src/libcharon/sa/ike_sa_manager.h
 +++ b/src/libcharon/sa/ike_sa_manager.h
-@@ -122,7 +122,8 @@ struct ike_sa_manager_t {
+@@ -123,7 +123,8 @@ struct ike_sa_manager_t {
 	ike_sa_t* (*checkout_by_message) (ike_sa_manager_t* this, message_t *message);
 
 	/**
@@ -520,7 +520,7 @@ index d87ba2d68..ba4f2c7e7 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.
-@@ -135,9 +136,12 @@ struct ike_sa_manager_t {
+@@ -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
@@ -535,10 +535,10 @@ index d87ba2d68..ba4f2c7e7 100644
 	/**
 	 * Reset initiator SPI.
 diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index e45c8ff3f..58a956a78 100644
+index d8d8a421a..f458ee0f1 100644
 --- a/src/libcharon/sa/trap_manager.c
 +++ b/src/libcharon/sa/trap_manager.c
-@@ -522,7 +522,7 @@ METHOD(trap_manager_t, acquire, void,
+@@ -523,7 +523,7 @@ METHOD(trap_manager_t, acquire, void,
 	peer_cfg_t *peer;
 	child_cfg_t *child;
 	ike_sa_t *ike_sa;
@@ -547,7 +547,7 @@ index e45c8ff3f..58a956a78 100644
 	bool wildcard, ignore = FALSE;
 
 	this->lock->read_lock(this->lock);
-@@ -599,36 +599,26 @@ METHOD(trap_manager_t, acquire, void,
+@@ -600,36 +600,26 @@ METHOD(trap_manager_t, acquire, void,
 	this->lock->unlock(this->lock);
 
 	if (wildcard)
@@ -601,10 +601,10 @@ index e45c8ff3f..58a956a78 100644
 
 	if (ike_sa)
 diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
-index 8ade8bf41..03b2cb0f4 100644
+index e0fffb907..dcaded59d 100644
 --- a/src/swanctl/commands/initiate.c
 +++ b/src/swanctl/commands/initiate.c
-@@ -13,6 +13,28 @@
+@@ -14,6 +14,28 @@
  * for more details.
  */
 
@@ -633,7 +633,7 @@ index 8ade8bf41..03b2cb0f4 100644
 #include "command.h"
 
 #include <errno.h>
-@@ -37,7 +59,7 @@ static int initiate(vici_conn_t *conn)
+@@ -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;
@@ -642,7 +642,7 @@ index 8ade8bf41..03b2cb0f4 100644
 	int ret = 0, timeout = 0, level = 1;
 
 	while (TRUE)
-@@ -64,6 +86,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;
@@ -655,7 +655,7 @@ index 8ade8bf41..03b2cb0f4 100644
 			case EOF:
 				break;
 			default:
-@@ -87,6 +115,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);
 	}
@@ -670,7 +670,7 @@ index 8ade8bf41..03b2cb0f4 100644
 	if (timeout)
 	{
 		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
-@@ -133,6 +169,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"},
@@ -680,5 +680,5 @@ index 8ade8bf41..03b2cb0f4 100644
 			{"raw",			'r', 0, "dump raw response message"},
 			{"pretty",		'P', 0, "dump raw response message in pretty print"},
 -- 
-2.36.1
+2.41.0

--- a/0002-vici-send-certificates-for-ike-sa-events.patch
+++ b/0002-vici-send-certificates-for-ike-sa-events.patch
@@ -1,4 +1,4 @@
-From d357d62bf0661294e063cec94d48ca929f119351 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/3] vici: send certificates for ike-sa events
@@ -12,10 +12,10 @@ 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 c35f4e1a9..001631e99 100644
+index bacb7b101..19acc0789 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -403,7 +403,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
+@@ -402,7 +402,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
  * List details of an IKE_SA
  */
 static void list_ike(private_vici_query_t *this, vici_builder_t *b,
@@ -24,7 +24,7 @@ index c35f4e1a9..001631e99 100644
 {
 	time_t t;
 	ike_sa_id_t *id;
-@@ -412,6 +412,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+@@ -411,6 +411,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
 	uint32_t if_id;
 	uint16_t alg, ks;
 	host_t *host;
@@ -33,7 +33,7 @@ index c35f4e1a9..001631e99 100644
 
 	b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa));
 	b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa));
-@@ -421,11 +423,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+@@ -420,11 +422,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
 	b->add_kv(b, "local-host", "%H", host);
 	b->add_kv(b, "local-port", "%d", host->get_port(host));
 	b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
@@ -77,7 +77,7 @@ index c35f4e1a9..001631e99 100644
 
 	eap = ike_sa->get_other_eap_id(ike_sa);
 
-@@ -557,7 +591,7 @@ CALLBACK(list_sas, vici_message_t*,
+@@ -556,7 +590,7 @@ CALLBACK(list_sas, vici_message_t*,
 		b = vici_builder_create();
 		b->begin_section(b, ike_sa->get_name(ike_sa));
 
@@ -86,7 +86,7 @@ index c35f4e1a9..001631e99 100644
 
 		b->begin_section(b, "child-sas");
 		csas = ike_sa->create_child_sa_enumerator(ike_sa);
-@@ -1775,7 +1809,7 @@ METHOD(listener_t, ike_updown, bool,
+@@ -1774,7 +1808,7 @@ METHOD(listener_t, ike_updown, bool,
 	}
 
 	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -95,7 +95,7 @@ index c35f4e1a9..001631e99 100644
 	b->end_section(b);
 
 	this->dispatcher->raise_event(this->dispatcher,
-@@ -1800,10 +1834,10 @@ METHOD(listener_t, ike_rekey, bool,
+@@ -1799,10 +1833,10 @@ METHOD(listener_t, ike_rekey, bool,
 	b = vici_builder_create();
 	b->begin_section(b, old->get_name(old));
 	b->begin_section(b, "old");
@@ -108,7 +108,7 @@ index c35f4e1a9..001631e99 100644
 	b->end_section(b);
 	b->end_section(b);
 
-@@ -1834,7 +1868,7 @@ METHOD(listener_t, ike_update, bool,
+@@ -1833,7 +1867,7 @@ METHOD(listener_t, ike_update, bool,
 	b->add_kv(b, "remote-port", "%d", remote->get_port(remote));
 
 	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -117,7 +117,7 @@ index c35f4e1a9..001631e99 100644
 	b->end_section(b);
 
 	this->dispatcher->raise_event(this->dispatcher,
-@@ -1864,7 +1898,7 @@ METHOD(listener_t, child_updown, bool,
+@@ -1863,7 +1897,7 @@ METHOD(listener_t, child_updown, bool,
 	}
 
 	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -126,7 +126,7 @@ index c35f4e1a9..001631e99 100644
 	b->begin_section(b, "child-sas");
 
 	snprintf(buf, sizeof(buf), "%s-%u", child_sa->get_name(child_sa),
-@@ -1899,7 +1933,7 @@ METHOD(listener_t, child_rekey, bool,
+@@ -1898,7 +1932,7 @@ METHOD(listener_t, child_rekey, bool,
 	b = vici_builder_create();
 
 	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -136,5 +136,5 @@ index c35f4e1a9..001631e99 100644
 
 	b->begin_section(b, old->get_name(old));
 -- 
-2.36.1
+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,4 +1,4 @@
-From 0a5809a8807c5160ee86da2c1c1586b23d98f04e 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/3] vici: add support for individual sa state changes
@@ -14,10 +14,10 @@ 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 001631e99..8010d8da8 100644
+index 19acc0789..fa1aca953 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -1775,8 +1775,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
+@@ -1774,8 +1774,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
 	this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
 	this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg);
 	this->dispatcher->manage_event(this->dispatcher, "ike-update", reg);
@@ -34,7 +34,7 @@ index 001631e99..8010d8da8 100644
 	manage_command(this, "list-sas", list_sas, reg);
 	manage_command(this, "list-policies", list_policies, reg);
 	manage_command(this, "list-conns", list_conns, reg);
-@@ -1877,6 +1885,46 @@ METHOD(listener_t, ike_update, bool,
+@@ -1876,6 +1884,46 @@ METHOD(listener_t, ike_update, bool,
 	return TRUE;
 }
 
@@ -81,7 +81,7 @@ index 001631e99..8010d8da8 100644
 METHOD(listener_t, child_updown, bool,
 	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
 {
-@@ -1956,6 +2004,62 @@ METHOD(listener_t, child_rekey, bool,
+@@ -1955,6 +2003,62 @@ METHOD(listener_t, child_rekey, bool,
 	return TRUE;
 }
 
@@ -144,7 +144,7 @@ index 001631e99..8010d8da8 100644
 METHOD(vici_query_t, destroy, void,
 	private_vici_query_t *this)
 {
-@@ -1976,8 +2080,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
+@@ -1975,8 +2079,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
 				.ike_updown = _ike_updown,
 				.ike_rekey = _ike_rekey,
 				.ike_update = _ike_update,
@@ -156,5 +156,5 @@ index 001631e99..8010d8da8 100644
 			.destroy = _destroy,
 		},
 -- 
-2.36.1
+2.41.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.6.tar.bz2.sig) = c5f863eb1f504033aec2ab48f802584f97bb39650e55e829e31f36ea1594428caab84ea559ba82b56b060019598aada02df09311b583b098e32f5abad9fab29b
-SHA512 (strongswan-5.9.6.tar.bz2) = 8efb7a55b074485b874e941e42462e97a404b4f84e2f90ed18ef66274731b22d167a571f6fd028dccc1f199f2e591c82616d0a832a5084e1981c6b867fe5bb6a
+SHA512 (strongswan-5.9.11.tar.bz2) = d500523215f5ec5c5550c4d2c49060b350ae396d8c60170792c46775d04fc7a132aa70a6242145477753668351d26ed957e08903683ecc340aa8d84fb2ae5498
+SHA512 (strongswan-5.9.11.tar.bz2.sig) = a434dc338641c808d3461de17c893a0d3b761cdba6cea5db0551fc75df498cfae26db379a86fd2a0a0e7710676a1cd657c01da435054a6814ec4ce6099db2b68
--- a/strongswan-5.9.4-test-socket.patch
+++ b/strongswan-5.9.4-test-socket.patch
@@ -1,31 +0,0 @@
-From 377039d24648f82dac35dcf22a2b43de81f2fb96 Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Thu, 11 Nov 2021 05:48:38 +0100
-Subject: [PATCH] Skip test case, which always hangs
-
-It just stops and does not continue. Avoid that test.
---
- src/libtls/tests/suites/test_socket.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libtls/tests/suites/test_socket.c b/src/libtls/tests/suites/test_socket.c
-index 9e26e91..5296680 100644
--- a/src/libtls/tests/suites/test_socket.c
-+++ b/src/libtls/tests/suites/test_socket.c
-@@ -804,11 +804,13 @@ Suite *socket_suite_create()
- 	add_tls_versions_test(test_tls_12_server, TLS_1_0, TLS_1_3);
- 	suite_add_tcase(s, tc);
- 
-+#if 0
- 	tc = tcase_create("TLS 1.3/key exchange groups");
- 	tcase_add_checked_fixture(tc, setup_creds, teardown_creds);
- 	tcase_add_loop_test(tc, test_tls13_ke_groups, 0,
- 						tls_crypto_get_supported_groups(NULL));
- 	suite_add_tcase(s, tc);
-+#endif
- 
- 	tc = tcase_create("TLS 1.3/signature schemes");
- 	tcase_add_checked_fixture(tc, setup_all_creds, teardown_creds);
-- 
-2.31.1
-
--- a/strongswan-5.9.5-atexit-handlers.patch
+++ b/strongswan-5.9.5-atexit-handlers.patch
@@ -1,71 +0,0 @@
--- strongswan-5.9.5-orig/src/libstrongswan/plugins/openssl/openssl_plugin.c	2022-01-08 12:54:02.000000000 +0100
-+++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_plugin.c	2022-02-23 23:12:03.685111475 +0100
-@@ -16,7 +16,6 @@
- 
- #include <library.h>
- #include <utils/debug.h>
-#include <collections/array.h>
- #include <threading/thread.h>
- #include <threading/mutex.h>
- #include <threading/thread_value.h>
-@@ -74,13 +73,6 @@
- 	 * public functions
- 	 */
- 	openssl_plugin_t public;
-
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	/**
-	 * Loaded providers
-	 */
-	array_t *providers;
-#endif
- };
- 
- /**
-@@ -881,21 +873,12 @@
- #endif
- 	}
- 	*features = f;
-	return countof(f);
-+	return count;
- }
- 
- METHOD(plugin_t, destroy, void,
- 	private_openssl_plugin_t *this)
- {
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	OSSL_PROVIDER *provider;
-	while (array_remove(this->providers, ARRAY_TAIL, &provider))
-	{
-		OSSL_PROVIDER_unload(provider);
-	}
-	array_destroy(this->providers);
-#endif /* OPENSSL_VERSION_NUMBER */
-
- /* OpenSSL 1.1.0 cleans up itself at exit and while OPENSSL_cleanup() exists we
-  * can't call it as we couldn't re-initialize the library (as required by the
-  * unit tests and the Android app) */
-@@ -1009,20 +992,16 @@
- 			DBG1(DBG_LIB, "unable to load OpenSSL FIPS provider");
- 			return NULL;
- 		}
-		array_insert_create(&this->providers, ARRAY_TAIL, fips);
- 		/* explicitly load the base provider containing encoding functions */
-		array_insert_create(&this->providers, ARRAY_TAIL,
-							OSSL_PROVIDER_load(NULL, "base"));
-+		OSSL_PROVIDER_load(NULL, "base");
- 	}
- 	else if (lib->settings->get_bool(lib->settings, "%s.plugins.openssl.load_legacy",
- 									 TRUE, lib->ns))
- 	{
- 		/* load the legacy provider for algorithms like MD4, DES, BF etc. */
-		array_insert_create(&this->providers, ARRAY_TAIL,
-							OSSL_PROVIDER_load(NULL, "legacy"));
-+		OSSL_PROVIDER_load(NULL, "legacy");
- 		/* explicitly load the default provider, as mentioned by crypto(7) */
-		array_insert_create(&this->providers, ARRAY_TAIL,
-							OSSL_PROVIDER_load(NULL, "default"));
-+		OSSL_PROVIDER_load(NULL, "default");
- 	}
- 	ossl_provider_names_t data = {};
- 	OSSL_PROVIDER_do_all(NULL, concat_ossl_providers, &data);
--- a/strongswan-5.9.6-error-format-security.patch
+++ b/strongswan-5.9.6-error-format-security.patch
@@ -1,11 +0,0 @@
--- strongswan-5.9.6-orig/src/libstrongswan/utils/enum.c	2022-04-16 10:08:07.000000000 +0200
-+++ strongswan-5.9.6/src/libstrongswan/utils/enum.c	2022-06-20 23:21:47.408857710 +0200
-@@ -97,7 +97,7 @@
- 		return buf;
- 	}
- 
-	if (snprintf(buf, len, e->names[0]) >= len)
-+	if (snprintf(buf, len, "%s", e->names[0]) >= len)
- 	{
- 		return NULL;
- 	}
--- a/strongswan-5.9.7-error-no-format.patch
+++ b/strongswan-5.9.7-error-no-format.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index f9e6e55c2..247d055d8 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1480,7 +1480,6 @@ else
+ fi
+ # disable some warnings, whether explicitly enabled above or by default
+ # these are not compatible with our custom printf specifiers
+-WARN_CFLAGS="$WARN_CFLAGS -Wno-format"
+ WARN_CFLAGS="$WARN_CFLAGS -Wno-format-security"
+ # we generally use comments, but GCC doesn't seem to recognize many of them
+ WARN_CFLAGS="$WARN_CFLAGS -Wno-implicit-fallthrough"
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -1,6 +1,6 @@
 %global _hardened_build 1
 #%%define prerelease dr1
-%global dist .nhrp.9%{?dist}
+%global dist .nhrp.11%{?dist}

 %bcond_without python3
 %bcond_without perl
@@ -13,31 +13,36 @@
 %bcond_with tss_trousers
 %endif

+%global forgeurl0 https://github.com/strongswan/strongswan
+
 Name:           strongswan
-Version:        5.9.6
-Release:        1%{?dist}
+Version:        5.9.11
+Release:        3%{?dist}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 License:        GPLv2+
-URL:            http://www.strongswan.org/
-Source0:        http://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2
-Source1:        http://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2.sig
+URL:            https://www.strongswan.org/
+VCS:            git:%{forgeurl0}
+Source0:        https://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2
+Source1:        https://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2.sig
 Source2:        https://download.strongswan.org/STRONGSWAN-RELEASE-PGP-KEY
 Source3:        tmpfiles-strongswan.conf
 Patch0:         strongswan-5.6.0-uintptr_t.patch
-# https://github.com/strongswan/strongswan/issues/1025
-Patch1:         strongswan-5.9.6-error-format-security.patch
+# https://github.com/strongswan/strongswan/issues/1198
+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.patch

-# only needed for pre-release versions
-#BuildRequires:  autoconf automake
-
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gnupg2
 BuildRequires:  make
 BuildRequires:  gcc
+BuildRequires:  systemd
 BuildRequires:  systemd-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  gmp-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  openldap-devel
@@ -48,7 +53,6 @@ BuildRequires:  libxml2-devel
 BuildRequires:  pam-devel
 BuildRequires:  json-c-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  systemd-devel
 BuildRequires:  iptables-devel
 BuildRequires:  libcap-devel
 BuildRequires:  tpm2-tss-devel
@@ -61,7 +65,7 @@ BuildRequires:  python3-pytest
 %endif

 %if %{with perl}
-BuildRequires:  perl-devel perl-macros
+BuildRequires:  perl-devel perl-generators
 BuildRequires:  perl(ExtUtils::MakeMaker)
 %endif

@@ -221,8 +225,6 @@ for Strongswan runtime configuration from perl applications.
    --enable-imv-attestation \
    --enable-imv-os \
    --enable-imc-os \
-    --enable-imc-swid \
-    --enable-imv-swid \
    --enable-imc-swima \
    --enable-imv-swima \
    --enable-imc-hcd \
@@ -259,6 +261,9 @@ for p in bypass-lan; do
    echo -e "\ncharon.plugins.${p}.load := no" >> conf/plugins/${p}.opt
 done

+# ensure manual page is regenerated with local configuration
+rm -f src/ipsec/_ipsec.8
+
 %make_build

 pushd src/libcharon/plugins/vici
@@ -417,10 +422,50 @@ install -D -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/strongswan-starter.co
 %endif

 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jul 14 2023 Paul Wouters <paul.wouters@aiven.io - 5.9.11-1
+- Resolves: rhbz#2214186 strongswan-5.9.11 is available
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 5.9.10-2
+- Rebuilt for Python 3.12
+
+* Thu Mar 02 2023 Paul Wouters <paul.wouters@aiven.io - 5.9.10-1
+- Update to 5.9.10
+
+* Tue Feb 28 2023 Paul Wouters <paul.wouters@aiven.io - 5.9.9-3
+- Resolves: CVE-2023-26463 authorization bypass in TLS-based EAP methods
+
+* Mon Jan 16 2023 Petr Menšík <pemensik@redhat.com> - 5.9.9-2
+- Use configure paths in manual pages (#2106120)
+
+* Sun Jan 15 2023 Petr Menšík <pemensik@redhat.com> - 5.9.9-1
+- Update to 5.9.9 (#2157850)
+
+* Thu Dec 08 2022 Jitka Plesnikova <jplesnik@redhat.com> - 5.9.8-2
+- Add BR perl-generators to automatically generates run-time dependencies
+  for installed Perl files
+
+* Sun Oct 16 2022 Arne Reiter <redhat@arnereiter.de> - 5.9.8-1
+- Resolves rhbz#2112274 strongswan-5.9.8 is available
+- Patch1 removes CFLAGS -Wno-format which interferes with -Werror=format-security
+- Add BuildRequire for autoconf and automake, now required for release
+- Remove obsolete patches
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jun 22 2022 Arne Reiter <redhat@arnereiter.de> - 5.9.6-1
 - Resolves rhbz#2080070 strongswan-5.9.6 is available
 - Fixed missing format string in enum_flags_to_string()

+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.9.5-4
+- Rebuilt for Python 3.11
+
 * Fri Feb 25 2022 Arne Reiter <redhat@arnereiter.de> - 5.9.5-3
 - Resolves: rhbz#2048108 - segfault at 18 ip 00007f4c7c0d841c sp 00007ffe49f61b70 error 4 in libc.so.6
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
Fedora Release Engineering	19c48bd52d	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-27 04:30:59 +00:00
Fedora Release Engineering	c14cb600a0	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-22 02:39:37 +00:00
Paul Wouters	9e397bfc7d	new sources	2023-07-17 17:14:14 -04:00
Paul Wouters	9d159bf0d0	- Resolves: rhbz#2214186 strongswan-5.9.11 is available	2023-07-14 13:45:25 -04:00
Python Maint	f779b6c7bb	Rebuilt for Python 3.12	2023-06-13 23:05:47 +02:00
Paul Wouters	9d642ad352	no longer use patches merged upstream	2023-03-02 11:02:38 -05:00
Paul Wouters	0132cc5668	- Update to 5.9.10	2023-03-02 10:24:58 -05:00
Paul Wouters	33fb3b13a3	- Resolves: CVE-2023-26463 authorization bypass in TLS-based EAP methods	2023-02-28 17:38:50 -05:00
Petr Menšík	6000262f47	Use configure paths in manual pages (#2106120 )	2023-01-16 19:46:37 +01:00
Petr Menšík	d7206ab591	Switch all URLs to https Include also github repository link in package to simplify upstream changes tracking.	2023-01-16 14:04:39 +01:00
Petr Menšík	585aca3015	Update to 5.9.9 (#2157850 )	2023-01-15 15:33:16 +01:00
Jitka Plesnikova	ea8056eb33	Add BR perl-generators to automatically generates run-time dependencies for installed Perl files	2022-12-08 16:46:43 +01:00
Paul Wouters	199f1d8708	fixup systemd build requires	2022-10-16 22:42:15 -04:00
Paul Wouters	243ac7aa4a	remove obsoleted --enable-imc-swid, --enable-imv-swid	2022-10-16 21:55:29 -04:00
Arne Reiter	d8e91f4aa4	Resolves rhbz#2112274 strongswan-5.9.8 is available Patch1 removes CFLAGS -Wno-format which interferes with -Werror=format-security Add BuildRequire for autoconf and automake, now required for release Remove obsolete patches	2022-10-16 11:47:16 +02:00
Fedora Release Engineering	27a4aa8167	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-23 09:32:45 +00:00
Petr Menšík	ea8baece11	fixup! Remove signature key from a cache, include it inside git	2022-06-23 19:41:55 +02:00
Petr Menšík	de70bbe3c5	Remove signature key from a cache, include it inside git Key should be tracked by git. It is small and should not change very often. Ensure signature has trust anchor.	2022-06-23 17:15:48 +02:00
Arne Reiter	271d4eca54	Resolves rhbz#2080070 strongswan-5.9.6 is available	2022-06-23 08:54:21 +02:00
Arne Reiter	9f5e4942d3	Resolves rhbz#2080070 strongswan-5.9.6 is available	2022-06-22 18:02:45 +02:00
Python Maint	15e47bc297	Rebuilt for Python 3.11	2022-06-13 17:17:06 +02:00