Support GRE key in selectors

0001-charon-add-optional-source-and-remote-overrides-for-.patch

@@ -1,4 +1,4 @@
-From d917774f73954cc6367e73b775ff9ea115d6fd28 Mon Sep 17 00:00:00 2001
+From 1baf500104e963e0d0d410c95e7dcec899173b77 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
@@ -21,7 +21,7 @@ and is a prerequisite for dmvpn support.
  7 files changed, 186 insertions(+), 39 deletions(-)
 
 diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
-index 027f48e937..ac4661a323 100644
+index 027f48e93..26501768d 100644
 --- a/src/libcharon/control/controller.c
 +++ b/src/libcharon/control/controller.c
 @@ -1,4 +1,6 @@
@@ -72,7 +72,7 @@ index 027f48e937..ac4661a323 100644
  	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);
++	return this->public.initiate2(this, peer_cfg, child_cfg, NULL, NULL, callback, param, max_level, timeout, limits);
 +}
 +
 +METHOD(controller_t, initiate2, status_t,
@@ -101,7 +101,7 @@ index 027f48e937..ac4661a323 100644
  			.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..f5c60e2e7 100644
 --- a/src/libcharon/control/controller.h
 +++ b/src/libcharon/control/controller.h
 @@ -98,6 +98,34 @@ struct controller_t {
@@ -140,7 +140,7 @@ index 36a1d46317..f5c60e2e72 100644
  	 * Terminate an IKE_SA and all of its CHILD_SAs.
  	 *
 diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
-index 1c236d2491..932d0cb5a8 100644
+index 1c236d249..932d0cb5a 100644
 --- a/src/libcharon/plugins/vici/vici_control.c
 +++ b/src/libcharon/plugins/vici/vici_control.c
 @@ -1,4 +1,6 @@
@@ -229,23 +229,22 @@ index 1c236d2491..932d0cb5a8 100644
  
  /**
 diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 7763ae844e..cf53e9ae00 100644
+index 7763ae844..59852f253 100644
 --- a/src/libcharon/sa/ike_sa_manager.c
 +++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -1,5 +1,7 @@
+@@ -1,4 +1,6 @@
  /*
-  * Copyright (C) 2008-2022 Tobias Brunner
 + * Copyright (C) 2023 Zoran Peričić <zpericic@netst.org>
 + * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
+  * Copyright (C) 2008-2022 Tobias Brunner
   * Copyright (C) 2005-2011 Martin Willi
   * Copyright (C) 2005 Jan Hutter
-  *
 @@ -1499,6 +1501,13 @@ typedef struct {
  
  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);
++	return this->public.checkout_by_config2(this, peer_cfg, NULL, NULL);
 +}
 +
 +METHOD(ike_sa_manager_t, checkout_by_config2, ike_sa_t*,
@@ -303,12 +302,12 @@ index 7763ae844e..cf53e9ae00 100644
  			.checkout = _checkout,
  			.checkout_by_message = _checkout_by_message,
  			.checkout_by_config = _checkout_by_config,
-+			.checkout_by_config2 = _checkout_by_config2,
++			.checkout_by_config2 = _checkout_by_config,
  			.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..d001f5a80 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 {
@@ -351,7 +350,7 @@ index 004cc22168..d001f5a802 100644
  	 * Reset initiator SPI.
  	 *
 diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index 1b85c66a5b..bbc480c0cd 100644
+index 1b85c66a5..bbc480c0c 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,
@@ -417,7 +416,7 @@ 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..c0fc8c595 100644
 --- a/src/swanctl/commands/initiate.c
 +++ b/src/swanctl/commands/initiate.c
 @@ -1,4 +1,5 @@
@@ -473,5 +472,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.45.2
 

0002-vici-send-certificates-for-ike-sa-events.patch

@@ -1,4 +1,4 @@
-From f6210f6ab72ead26a24a8f231eee67948d3ca543 Mon Sep 17 00:00:00 2001
+From ea77f7d906d5e7bbe44ba6e912dd386f25414492 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
@@ -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.45.2
 

0003-vici-add-support-for-individual-sa-state-changes.patch

@@ -1,4 +1,4 @@
-From effc140ed0ed5c7f1897c8abb6364d2d4789a4ee Mon Sep 17 00:00:00 2001
+From 3f4e26a2163bf30481887795f9faad208bfc1be0 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
@@ -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.45.2
 

0004-Support-GRE-key-in-selectors.patch

@@ -1,23 +1,21 @@
-From 7f32aed540533e50fa05486df471ef3c19879324 Mon Sep 17 00:00:00 2001
+From 0ceda5a95355bb803cbcdf3eeabbcb6ec2577922 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.
+Subject: [PATCH 4/4] Support GRE key in selectors.
 
-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(-)
+ .../kernel_netlink/kernel_netlink_ipsec.c     | 20 ++++++++++++
+ .../plugins/load_tester/load_tester_config.c  | 22 ++++++++++++-
+ src/libcharon/plugins/stroke/stroke_config.c  | 22 ++++++++++++-
+ src/libcharon/plugins/vici/vici_config.c      | 32 ++++++++++++++++++-
+ .../selectors/traffic_selector.c              | 20 ++++++++++++
+ .../selectors/traffic_selector.h              | 12 +++++++
+ src/starter/confread.c                        | 24 +++++++++++++-
+ src/swanctl/swanctl.opt                       |  3 ++
+ 8 files changed, 151 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
+index db0b2ac37..e4e7d9ecb 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,
@@ -28,7 +26,7 @@ index db0b2ac37a..d4f9571817 100644
  
  	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,
+@@ -884,6 +885,25 @@ static struct xfrm_selector ts2selector(traffic_selector_t *src,
  		sel.dport = htons(traffic_selector_icmp_code(port));
  		sel.dport_mask = sel.dport ? ~0 : 0;
  	}
@@ -39,6 +37,7 @@ index db0b2ac37a..d4f9571817 100644
 +		gre_key = htons(traffic_selector_gre_key(dst->get_from_port(dst), dst->get_to_port(dst)));
 +		if ( gre_key != 0 )
 +		{
++			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;
@@ -54,7 +53,7 @@ index db0b2ac37a..d4f9571817 100644
  	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
+index 58e1cd98a..ac67875d8 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,
@@ -71,15 +70,15 @@ index 58e1cd98a0..f20fdae522 100644
 +			{
 +				return FALSE;
 +			}
-+			*from_port = (p >> 16) & 0xffff;
-+			*to_port = p & 0xffff;
++			end->from_port = (p >> 16) & 0xffff;
++			end->to_port = p & 0xffff;
 +			if (*endptr)
 +			{
 +				return FALSE;
 +			}
 +		} else {
-+			*from_port = 0;
-+			*to_port = 0;
++			end->from_port = 0;
++			end->to_port = 0;
 +		}
 +	}
 +	else if (streq(port, "%any"))
@@ -87,7 +86,7 @@ index 58e1cd98a0..f20fdae522 100644
  		*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
+index 55db379ff..b4340b8d1 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,
@@ -120,10 +119,10 @@ index 55db379ffe..b4340b8d1b 100644
  		*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
+index c858e9945..c72c97f76 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,
+@@ -715,7 +715,31 @@ CALLBACK(parse_ts, bool,
  				proto = (uint8_t)p;
  			}
  		}
@@ -132,15 +131,19 @@ index c858e9945c..24a254689b 100644
 +		{
 +			if (*port && !streq(port, "any"))
 +			{
++				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 {
@@ -152,7 +155,7 @@ index c858e9945c..24a254689b 100644
  		{
  			from = 0xffff;
  			to = 0;
-@@ -752,6 +772,11 @@ CALLBACK(parse_ts, bool,
+@@ -752,8 +776,14 @@ CALLBACK(parse_ts, bool,
  			}
  		}
  	}
@@ -163,9 +166,12 @@ index c858e9945c..24a254689b 100644
 +	}
  	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 fe61e3768b..09757ec36f 100644
+index fe61e3768..09757ec36 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)
@@ -210,7 +216,7 @@ index fe61e3768b..09757ec36f 100644
  		{
  			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
+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)
@@ -233,7 +239,7 @@ index 367b4fff94..b7010e4a73 100644
   * Compare two traffic selectors, usable as sort function
   *
 diff --git a/src/starter/confread.c b/src/starter/confread.c
-index 5065bc369f..039b6f402b 100644
+index 5065bc369..039b6f402 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,
@@ -268,7 +274,7 @@ index 5065bc369f..039b6f402b 100644
  				end->from_port = 0;
  				end->to_port = 0xffff;
 diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
-index d9fd949ed1..1d63dadb89 100644
+index d9fd949ed..1d63dadb8 100644
 --- a/src/swanctl/swanctl.opt
 +++ b/src/swanctl/swanctl.opt
 @@ -765,6 +765,9 @@ connections.<conn>.children.<child>.local_ts = dynamic
@@ -282,5 +288,5 @@ index d9fd949ed1..1d63dadb89 100644
  	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
+2.45.2
 

strongswan-6.0.0-gcc15.patch

@@ -1,109 +0,0 @@
-From cf7fb47788dfb83bb5d8bd0bffdb582e381a2f0a Mon Sep 17 00:00:00 2001
-From: Thomas Egerer <thomas.egerer@secunet.com>
-Date: Fri, 6 Sep 2024 13:29:40 +0200
-Subject: [PATCH] array: Don't use realloc() with zero size in array_compress()
-
-The behavior of realloc(3) with zero size was apparently implementation
-defined.  While glibc documents the behavior as equivalent to free(3),
-that might not apply to other C libraries.  With C17, this behavior has
-been deprecated, and with C23, the behavior is now undefined.  It's also
-why valgrind warns about this use.
-
-Hence, when array_compress() would call realloc() with a zero size, we
-now call free() explicitly and set the pointer to NULL.
-
-Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
----
- src/libstrongswan/collections/array.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/libstrongswan/collections/array.c b/src/libstrongswan/collections/array.c
-index 8acc8051d53..8b6c6d7397e 100644
---- a/src/libstrongswan/collections/array.c
-+++ b/src/libstrongswan/collections/array.c
-@@ -197,7 +197,17 @@ void array_compress(array_t *array)
- 		}
- 		if (tail)
- 		{
--			array->data = realloc(array->data, get_size(array, array->count));
-+			size_t size = get_size(array, array->count);
-+
-+			if (size)
-+			{
-+				array->data = realloc(array->data, size);
-+			}
-+			else
-+			{
-+				free(array->data);
-+				array->data = NULL;
-+			}
- 			array->tail = 0;
- 		}
- 	}
----
-
-From f1f0bd9de60e2697a712e72b7ae9f79763a0901d Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Thu, 9 Jan 2025 16:05:39 +0100
-Subject: [PATCH] ctr: Remove parameter-less constructor prototype
-
-Useless and causes a compiler warning/error:
-
-  error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C23, conflicting with a subsequent declaration [-Werror,-Wdeprecated-non-prototype]
----
- src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.h | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.h b/src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.h
-index e9421a1be9f..3814465e48b 100644
---- a/src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.h
-+++ b/src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.h
-@@ -37,11 +37,6 @@ struct ctr_ipsec_crypter_t {
- 	crypter_t crypter;
- };
- 
--/**
-- * Create a ctr_ipsec_crypter instance.
-- */
--ctr_ipsec_crypter_t *ctr_ipsec_crypter_create();
--
- /**
-  * Create a ctr_ipsec_crypter instance.
-  *
----
-
-From 227d7ef9a24b8c62d6965c1c1690252bde7c698d Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 10 Jan 2025 15:43:11 +0100
-Subject: [PATCH] tnc-imv: Add missing argument to IMV recommendations
- constructor
-
-This avoids the following warning/error:
-
-tnc_imv_manager.c:244:39: error: passing arguments to 'tnc_imv_recommendations_create' without a prototype is deprecated in all versions of C and is not supported in C23 [-Werror,-Wdeprecated-non-prototype]
-  244 |         return tnc_imv_recommendations_create(this->imvs);
-      |                                              ^
----
- src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.h b/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.h
-index f7178876cfd..60272978ad3 100644
---- a/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.h
-+++ b/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.h
-@@ -27,8 +27,11 @@
- #include <collections/linked_list.h>
- 
- /**
-- * Create an IMV empty recommendations instance
-+ * Create an empty IMV recommendations instance
-+ *
-+ * @param imv_list		list of IMVs that could provide recommendations
-+ * @return				created instance
-  */
--recommendations_t *tnc_imv_recommendations_create();
-+recommendations_t *tnc_imv_recommendations_create(linked_list_t *imv_list);
- 
- #endif /** TNC_IMV_RECOMMENDATIONS_H_ @}*/
----
-

strongswan-6.0.1-gcc15.patch

@@ -1,597 +0,0 @@
-From a7b5de569082398a14b7e571498e55d005903aaf Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 21 Feb 2025 17:18:35 +0100
-Subject: [PATCH] pki: Fix signature of help() to match that of a callback in
- command_t
-
----
- src/pki/command.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pki/command.c b/src/pki/command.c
-index accec5fe51b..6e6bf041e18 100644
---- a/src/pki/command.c
-+++ b/src/pki/command.c
-@@ -265,7 +265,7 @@ int command_usage(char *error)
- /**
-  * Show usage information
-  */
--static int help(int c, char *v[])
-+static int help()
- {
- 	return command_usage(NULL);
- }
----
-
-From 38d89f57f0771d3cc7b2ab70849584685ada2bc0 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 21 Feb 2025 16:47:34 +0100
-Subject: [PATCH] charon-nm: Use CALLBACK macro for callback job's cancel
- implementation
-
-Casting to this specific function type doesn't work anymore if C23 is
-used as the types mismatch.
----
- src/charon-nm/nm/nm_backend.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c
-index aefd3f95688..8ee1785212e 100644
---- a/src/charon-nm/nm/nm_backend.c
-+++ b/src/charon-nm/nm/nm_backend.c
-@@ -78,7 +78,8 @@ static job_requeue_t run(nm_backend_t *this)
- /**
-  * Cancel the GLib Main Event Loop
-  */
--static bool cancel(nm_backend_t *this)
-+CALLBACK(cancel, bool,
-+	nm_backend_t *this)
- {
- 	if (this->loop)
- 	{
-@@ -152,7 +153,7 @@ static bool nm_backend_init()
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)run, this,
--				NULL, (callback_job_cancel_t)cancel, JOB_PRIO_CRITICAL));
-+				NULL, cancel, JOB_PRIO_CRITICAL));
- 	return TRUE;
- }
- 
----
-
-From d5d2568ff0e88d364dadf50b67bf17050763cf98 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 21 Feb 2025 16:45:57 +0100
-Subject: [PATCH] callback-job: Replace return_false() in constructors with
- dedicated function
-
-Besides being clearer, this fixes issues with GCC 15.  The latter uses
-C23 by default, which changes the meaning of function declarations
-without parameters such as
-
-	bool return false();
-
-Instead of "this function takes an unknown number of arguments", this
-now equals (void), that is, "this function takes no arguments".  So we
-run into incompatible pointer type warnings all over when using such
-functions.  They could be cast to (void*) but this seems the cleaner
-solution for this use case.
----
- src/charon-cmd/cmd/cmd_connection.c                   |  2 +-
- .../jni/libandroidbridge/backend/android_dns_proxy.c  |  2 +-
- .../jni/libandroidbridge/backend/android_service.c    |  6 +++---
- src/libcharon/network/receiver.c                      |  2 +-
- src/libcharon/network/sender.c                        |  2 +-
- .../plugins/bypass_lan/bypass_lan_listener.c          |  4 ++--
- .../plugins/eap_radius/eap_radius_accounting.c        |  2 +-
- src/libcharon/plugins/eap_radius/eap_radius_plugin.c  |  2 +-
- src/libcharon/plugins/ha/ha_ctl.c                     |  2 +-
- src/libcharon/plugins/ha/ha_dispatcher.c              |  2 +-
- src/libcharon/plugins/ha/ha_segments.c                |  6 +++---
- .../kernel_libipsec/kernel_libipsec_esp_handler.c     |  2 +-
- .../plugins/kernel_libipsec/kernel_libipsec_router.c  |  2 +-
- src/libcharon/plugins/smp/smp.c                       |  4 ++--
- src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c   |  2 +-
- src/libcharon/plugins/uci/uci_control.c               |  2 +-
- src/libipsec/ipsec_event_relay.c                      |  2 +-
- src/libipsec/ipsec_processor.c                        |  4 ++--
- src/libpttls/pt_tls_dispatcher.c                      |  2 +-
- src/libstrongswan/networking/streams/stream_service.c |  2 +-
- src/libstrongswan/processing/jobs/callback_job.c      | 10 +++++++++-
- src/libstrongswan/processing/jobs/callback_job.h      | 11 ++++++++++-
- src/libstrongswan/processing/scheduler.c              |  3 ++-
- src/libstrongswan/processing/watcher.c                |  4 ++--
- src/libtls/tests/suites/test_socket.c                 |  2 +-
- 25 files changed, 51 insertions(+), 33 deletions(-)
-
-diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
-index 8e8d8236e52..e220e33a62a 100644
---- a/src/charon-cmd/cmd/cmd_connection.c
-+++ b/src/charon-cmd/cmd/cmd_connection.c
-@@ -585,7 +585,7 @@ cmd_connection_t *cmd_connection_create()
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio(
- 			(callback_job_cb_t)initiate, this, NULL,
--			(callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+			callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 
- 	return &this->public;
- }
-diff --git a/src/libcharon/network/receiver.c b/src/libcharon/network/receiver.c
-index e79d5974409..480d1d622d5 100644
---- a/src/libcharon/network/receiver.c
-+++ b/src/libcharon/network/receiver.c
-@@ -737,7 +737,7 @@ receiver_t *receiver_create()
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)receive_packets,
--			this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+			this, NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 
- 	return &this->public;
- }
-diff --git a/src/libcharon/network/sender.c b/src/libcharon/network/sender.c
-index 4543766d62e..3fcd17f1b63 100644
---- a/src/libcharon/network/sender.c
-+++ b/src/libcharon/network/sender.c
-@@ -216,7 +216,7 @@ sender_t * sender_create()
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)send_packets,
--			this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+			this, NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 
- 	return &this->public;
- }
-diff --git a/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c b/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c
-index db7abd8146b..c9aed3666fc 100644
---- a/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c
-+++ b/src/libcharon/plugins/bypass_lan/bypass_lan_listener.c
-@@ -227,7 +227,7 @@ METHOD(kernel_listener_t, roam, bool,
- {
- 	lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create((callback_job_cb_t)update_bypass, this,
--									NULL, (callback_job_cancel_t)return_false));
-+									NULL, callback_job_cancel_thread));
- 	return TRUE;
- }
- 
-@@ -269,7 +269,7 @@ METHOD(bypass_lan_listener_t, reload_interfaces, void,
- 	this->mutex->unlock(this->mutex);
- 	lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create((callback_job_cb_t)update_bypass, this,
--									NULL, (callback_job_cancel_t)return_false));
-+									NULL, callback_job_cancel_thread));
- }
- 
- METHOD(bypass_lan_listener_t, destroy, void,
-diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
-index f833dc3c0b4..2f29d080764 100644
---- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
-+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
-@@ -706,7 +706,7 @@ static void schedule_interim(private_eap_radius_accounting_t *this,
- 			(job_t*)callback_job_create_with_prio(
- 				(callback_job_cb_t)send_interim,
- 				data, (void*)destroy_interim_data,
--				(callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL), tv);
-+				callback_job_cancel_thread, JOB_PRIO_CRITICAL), tv);
- 	}
- }
- 
-diff --git a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
-index 5051542615a..55d5e032cea 100644
---- a/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
-+++ b/src/libcharon/plugins/eap_radius/eap_radius_plugin.c
-@@ -445,7 +445,7 @@ void eap_radius_handle_timeout(ike_sa_id_t *id)
- 		lib->processor->queue_job(lib->processor,
- 				(job_t*)callback_job_create_with_prio(
- 						(callback_job_cb_t)delete_all_async, NULL, NULL,
--						(callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+						callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 	}
- 	else if (id)
- 	{
-diff --git a/src/libcharon/plugins/ha/ha_ctl.c b/src/libcharon/plugins/ha/ha_ctl.c
-index 8859bae166b..3d2ac7de84d 100644
---- a/src/libcharon/plugins/ha/ha_ctl.c
-+++ b/src/libcharon/plugins/ha/ha_ctl.c
-@@ -199,6 +199,6 @@ ha_ctl_t *ha_ctl_create(ha_segments_t *segments, ha_cache_t *cache)
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)dispatch_fifo,
--			this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+			this, NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 	return &this->public;
- }
-diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
-index 5de26a65a27..83be91ab159 100644
---- a/src/libcharon/plugins/ha/ha_dispatcher.c
-+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
-@@ -1184,7 +1184,7 @@ ha_dispatcher_t *ha_dispatcher_create(ha_socket_t *socket,
- 	);
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)dispatch, this,
--				NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+				NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 
- 	return &this->public;
- }
-diff --git a/src/libcharon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c
-index afb76b39ea2..32d9ee40717 100644
---- a/src/libcharon/plugins/ha/ha_segments.c
-+++ b/src/libcharon/plugins/ha/ha_segments.c
-@@ -316,7 +316,7 @@ static void start_watchdog(private_ha_segments_t *this)
- 	this->heartbeat_active = TRUE;
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)watchdog, this,
--				NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+				NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- }
- 
- METHOD(ha_segments_t, handle_status, void,
-@@ -404,7 +404,7 @@ static void start_heartbeat(private_ha_segments_t *this)
- {
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)send_status,
--			this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+			this, NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- }
- 
- /**
-@@ -451,7 +451,7 @@ static void start_autobalance(private_ha_segments_t *this)
- 	DBG1(DBG_CFG, "scheduling HA autobalance every %ds", this->autobalance);
- 	lib->scheduler->schedule_job(lib->scheduler,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)autobalance,
--			this, NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL),
-+			this, NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL),
- 		this->autobalance);
- }
- 
-diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_esp_handler.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_esp_handler.c
-index 095ad67b4b0..c18e266e4d1 100644
---- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_esp_handler.c
-+++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_esp_handler.c
-@@ -337,7 +337,7 @@ kernel_libipsec_esp_handler_t *kernel_libipsec_esp_handler_create()
- 	}
- 	lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create(send_esp, this, NULL,
--										(callback_job_cancel_t)return_false));
-+										callback_job_cancel_thread));
- 	return &this->public;
- }
- 
-diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_router.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_router.c
-index 74746e251de..07adc70be3e 100644
---- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_router.c
-+++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_router.c
-@@ -364,7 +364,7 @@ kernel_libipsec_router_t *kernel_libipsec_router_create()
- 	charon->receiver->add_esp_cb(charon->receiver, receiver_esp_cb, NULL);
- 	lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create((callback_job_cb_t)handle_plain, this,
--									NULL, (callback_job_cancel_t)return_false));
-+										NULL, callback_job_cancel_thread));
- 
- 	router = &this->public;
- 	return &this->public;
-diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
-index 6ca9f13997e..85ff5830bc5 100644
---- a/src/libcharon/plugins/smp/smp.c
-+++ b/src/libcharon/plugins/smp/smp.c
-@@ -710,7 +710,7 @@ static job_requeue_t dispatch(private_smp_t *this)
- 	fdp = malloc_thing(int);
- 	*fdp = fd;
- 	job = callback_job_create((callback_job_cb_t)process, fdp, free,
--							  (callback_job_cancel_t)return_false);
-+							  callback_job_cancel_thread);
- 	lib->processor->queue_job(lib->processor, (job_t*)job);
- 
- 	return JOB_REQUEUE_DIRECT;
-@@ -800,7 +800,7 @@ plugin_t *smp_plugin_create()
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create_with_prio((callback_job_cb_t)dispatch, this,
--				NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+				NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 
- 	return &this->public.plugin;
- }
-diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
-index 30aeb116dec..da317a894d9 100644
---- a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
-+++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
-@@ -210,7 +210,7 @@ METHOD(tnc_pdp_connections_t, add, void,
- 	/* schedule timeout checking */
- 	lib->scheduler->schedule_job_ms(lib->scheduler,
- 				(job_t*)callback_job_create((callback_job_cb_t)check_timeouts,
--					this, NULL, (callback_job_cancel_t)return_false),
-+					this, NULL, callback_job_cancel_thread),
- 				this->timeout * 1000);
- 
- 	dbg_nas_user(nas_id, user_name, FALSE, "created");
-diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c
-index b033c832c8c..8074005ee57 100644
---- a/src/libcharon/plugins/uci/uci_control.c
-+++ b/src/libcharon/plugins/uci/uci_control.c
-@@ -296,7 +296,7 @@ uci_control_t *uci_control_create()
- 	{
- 		lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create_with_prio((callback_job_cb_t)receive,
--							this, NULL, (callback_job_cancel_t)return_false,
-+							this, NULL, callback_job_cancel_thread,
- 							JOB_PRIO_CRITICAL));
- 	}
- 	return &this->public;
-diff --git a/src/libipsec/ipsec_event_relay.c b/src/libipsec/ipsec_event_relay.c
-index 0f10795d168..802146eef21 100644
---- a/src/libipsec/ipsec_event_relay.c
-+++ b/src/libipsec/ipsec_event_relay.c
-@@ -230,7 +230,7 @@ ipsec_event_relay_t *ipsec_event_relay_create()
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create((callback_job_cb_t)handle_events, this,
--			NULL, (callback_job_cancel_t)return_false));
-+			NULL, callback_job_cancel_thread));
- 
- 	return &this->public;
- }
-diff --git a/src/libipsec/ipsec_processor.c b/src/libipsec/ipsec_processor.c
-index 2572b088089..8549fefe261 100644
---- a/src/libipsec/ipsec_processor.c
-+++ b/src/libipsec/ipsec_processor.c
-@@ -336,9 +336,9 @@ ipsec_processor_t *ipsec_processor_create()
- 
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create((callback_job_cb_t)process_inbound, this,
--									NULL, (callback_job_cancel_t)return_false));
-+									NULL, callback_job_cancel_thread));
- 	lib->processor->queue_job(lib->processor,
- 		(job_t*)callback_job_create((callback_job_cb_t)process_outbound, this,
--									NULL, (callback_job_cancel_t)return_false));
-+									NULL, callback_job_cancel_thread));
- 	return &this->public;
- }
-diff --git a/src/libpttls/pt_tls_dispatcher.c b/src/libpttls/pt_tls_dispatcher.c
-index a134bee238f..c7e42b277e1 100644
---- a/src/libpttls/pt_tls_dispatcher.c
-+++ b/src/libpttls/pt_tls_dispatcher.c
-@@ -156,7 +156,7 @@ METHOD(pt_tls_dispatcher_t, dispatch, void,
- 		lib->processor->queue_job(lib->processor,
- 				(job_t*)callback_job_create_with_prio((callback_job_cb_t)handle,
- 										connection, (void*)cleanup,
--										(callback_job_cancel_t)return_false,
-+										callback_job_cancel_thread,
- 										JOB_PRIO_CRITICAL));
- 	}
- }
-diff --git a/src/libstrongswan/networking/streams/stream_service.c b/src/libstrongswan/networking/streams/stream_service.c
-index 5b709a2247d..c85a0664351 100644
---- a/src/libstrongswan/networking/streams/stream_service.c
-+++ b/src/libstrongswan/networking/streams/stream_service.c
-@@ -221,7 +221,7 @@ static bool watch(private_stream_service_t *this, int fd, watcher_event_t event)
- 
- 		lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create_with_prio((void*)accept_async, data,
--				(void*)destroy_async_data, (callback_job_cancel_t)return_false,
-+				(void*)destroy_async_data, callback_job_cancel_thread,
- 				this->prio));
- 	}
- 	else
-diff --git a/src/libstrongswan/processing/jobs/callback_job.c b/src/libstrongswan/processing/jobs/callback_job.c
-index cb2a0aba5b9..3ab40b947c9 100644
---- a/src/libstrongswan/processing/jobs/callback_job.c
-+++ b/src/libstrongswan/processing/jobs/callback_job.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2009-2012 Tobias Brunner
-+ * Copyright (C) 2009-2025 Tobias Brunner
-  * Copyright (C) 2007-2011 Martin Willi
-  *
-  * Copyright (C) secunet Security Networks AG
-@@ -131,3 +131,11 @@ callback_job_t *callback_job_create(callback_job_cb_t cb, void *data,
- 	return callback_job_create_with_prio(cb, data, cleanup, cancel,
- 										 JOB_PRIO_MEDIUM);
- }
-+
-+/*
-+ * Described in header
-+ */
-+bool callback_job_cancel_thread(void *data)
-+{
-+	return FALSE;
-+}
-diff --git a/src/libstrongswan/processing/jobs/callback_job.h b/src/libstrongswan/processing/jobs/callback_job.h
-index 0f1ae212d87..fda86887944 100644
---- a/src/libstrongswan/processing/jobs/callback_job.h
-+++ b/src/libstrongswan/processing/jobs/callback_job.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2012 Tobias Brunner
-+ * Copyright (C) 2012-2025 Tobias Brunner
-  * Copyright (C) 2007-2011 Martin Willi
-  *
-  * Copyright (C) secunet Security Networks AG
-@@ -62,6 +62,15 @@ typedef void (*callback_job_cleanup_t)(void *data);
-  */
- typedef bool (*callback_job_cancel_t)(void *data);
- 
-+/**
-+ * Default implementation of callback_job_cancel_t that simply returns FALSE
-+ * to force cancellation of the thread by the processor.
-+ *
-+ * @param data			ignored argument
-+ * @return				always returns FALSE
-+ */
-+bool callback_job_cancel_thread(void *data);
-+
- /**
-  * Class representing an callback Job.
-  *
-diff --git a/src/libstrongswan/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c
-index c5e5dd83e70..76d98ddff51 100644
---- a/src/libstrongswan/processing/scheduler.c
-+++ b/src/libstrongswan/processing/scheduler.c
-@@ -329,7 +329,8 @@ scheduler_t * scheduler_create()
- 	this->heap = (event_t**)calloc(this->heap_size + 1, sizeof(event_t*));
- 
- 	job = callback_job_create_with_prio((callback_job_cb_t)schedule, this,
--										NULL, return_false, JOB_PRIO_CRITICAL);
-+										NULL, callback_job_cancel_thread,
-+										JOB_PRIO_CRITICAL);
- 	lib->processor->queue_job(lib->processor, (job_t*)job);
- 
- 	return &this->public;
-diff --git a/src/libstrongswan/processing/watcher.c b/src/libstrongswan/processing/watcher.c
-index 1200d670959..a86ec0910d1 100644
---- a/src/libstrongswan/processing/watcher.c
-+++ b/src/libstrongswan/processing/watcher.c
-@@ -291,7 +291,7 @@ static void notify(private_watcher_t *this, entry_t *entry,
- 
- 	this->jobs->insert_last(this->jobs,
- 					callback_job_create_with_prio((void*)notify_async, data,
--						(void*)notify_end, (callback_job_cancel_t)return_false,
-+						(void*)notify_end, callback_job_cancel_thread,
- 						JOB_PRIO_CRITICAL));
- }
- 
-@@ -559,7 +559,7 @@ METHOD(watcher_t, add, void,
- 
- 		lib->processor->queue_job(lib->processor,
- 			(job_t*)callback_job_create_with_prio((void*)watch, this,
--				NULL, (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
-+				NULL, callback_job_cancel_thread, JOB_PRIO_CRITICAL));
- 	}
- 	else
- 	{
-diff --git a/src/libtls/tests/suites/test_socket.c b/src/libtls/tests/suites/test_socket.c
-index 91ee58b975f..c17d0a8873e 100644
---- a/src/libtls/tests/suites/test_socket.c
-+++ b/src/libtls/tests/suites/test_socket.c
-@@ -587,7 +587,7 @@ static void start_echo_server(echo_server_config_t *config)
- 
- 	lib->processor->queue_job(lib->processor, (job_t*)
- 				callback_job_create((void*)serve_echo, config, NULL,
--									(callback_job_cancel_t)return_false));
-+									callback_job_cancel_thread));
- }
- 
- /**
----
-
-From 11978ddd39e800b5f35f721d726e8a4cb7e4ec0f Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 21 Feb 2025 17:00:44 +0100
-Subject: [PATCH] Cast uses of return_*(), nop() and enumerator_create_empty()
-
-As described in the previous commit, GCC 15 uses C23 by default and that
-changes the meaning of such argument-less function declarations.  So
-whenever we assign such a function to a pointer that expects a function
-with arguments it causes an incompatible pointer type warning.  We
-could define dedicated functions/callbacks whenever necessary, but this
-seems like the simpler approach for now (especially since most uses of
-these functions have already been cast).
----
- src/charon-nm/nm/nm_handler.c                           | 2 +-
- src/libcharon/encoding/payloads/encrypted_payload.c     | 2 +-
- src/libcharon/plugins/android_dns/android_dns_handler.c | 2 +-
- src/libcharon/plugins/ha/ha_attribute.c                 | 2 +-
- src/libcharon/plugins/updown/updown_handler.c           | 2 +-
- src/libstrongswan/utils/identification.c                | 6 +++---
- 6 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/charon-nm/nm/nm_handler.c b/src/charon-nm/nm/nm_handler.c
-index d7331ad72f6..39d0190ac9e 100644
---- a/src/charon-nm/nm/nm_handler.c
-+++ b/src/charon-nm/nm/nm_handler.c
-@@ -195,7 +195,7 @@ nm_handler_t *nm_handler_create()
- 		.public = {
- 			.handler = {
- 				.handle = _handle,
--				.release = nop,
-+				.release = (void*)nop,
- 				.create_attribute_enumerator = _create_attribute_enumerator,
- 			},
- 			.create_enumerator = _create_enumerator,
-diff --git a/src/libcharon/encoding/payloads/encrypted_payload.c b/src/libcharon/encoding/payloads/encrypted_payload.c
-index 676d00b7a29..4821c6108ed 100644
---- a/src/libcharon/encoding/payloads/encrypted_payload.c
-+++ b/src/libcharon/encoding/payloads/encrypted_payload.c
-@@ -1023,7 +1023,7 @@ encrypted_fragment_payload_t *encrypted_fragment_payload_create()
- 				.get_length = _frag_get_length,
- 				.add_payload = _frag_add_payload,
- 				.remove_payload = (void*)return_null,
--				.generate_payloads = nop,
-+				.generate_payloads = (void*)nop,
- 				.set_transform = _frag_set_transform,
- 				.get_transform = _frag_get_transform,
- 				.encrypt = _frag_encrypt,
-diff --git a/src/libcharon/plugins/android_dns/android_dns_handler.c b/src/libcharon/plugins/android_dns/android_dns_handler.c
-index 78f4f702aec..14d2ff99aa3 100644
---- a/src/libcharon/plugins/android_dns/android_dns_handler.c
-+++ b/src/libcharon/plugins/android_dns/android_dns_handler.c
-@@ -191,7 +191,7 @@ METHOD(enumerator_t, enumerate_dns, bool,
- 	VA_ARGS_VGET(args, type, data);
- 	*type = INTERNAL_IP4_DNS;
- 	*data = chunk_empty;
--	this->venumerate = return_false;
-+	this->venumerate = (void*)return_false;
- 	return TRUE;
- }
- 
-diff --git a/src/libcharon/plugins/ha/ha_attribute.c b/src/libcharon/plugins/ha/ha_attribute.c
-index b865a4b829b..103d1a93784 100644
---- a/src/libcharon/plugins/ha/ha_attribute.c
-+++ b/src/libcharon/plugins/ha/ha_attribute.c
-@@ -381,7 +381,7 @@ ha_attribute_t *ha_attribute_create(ha_kernel_t *kernel, ha_segments_t *segments
- 			.provider = {
- 				.acquire_address = _acquire_address,
- 				.release_address = _release_address,
--				.create_attribute_enumerator = enumerator_create_empty,
-+				.create_attribute_enumerator = (void*)enumerator_create_empty,
- 			},
- 			.reserve = _reserve,
- 			.destroy = _destroy,
-diff --git a/src/libcharon/plugins/updown/updown_handler.c b/src/libcharon/plugins/updown/updown_handler.c
-index 36eb15615a4..3707e1e658c 100644
---- a/src/libcharon/plugins/updown/updown_handler.c
-+++ b/src/libcharon/plugins/updown/updown_handler.c
-@@ -220,7 +220,7 @@ updown_handler_t *updown_handler_create()
- 			.handler = {
- 				.handle = _handle,
- 				.release = _release,
--				.create_attribute_enumerator = enumerator_create_empty,
-+				.create_attribute_enumerator = (void*)enumerator_create_empty,
- 			},
- 			.create_dns_enumerator = _create_dns_enumerator,
- 			.destroy = _destroy,
-diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identifi
-100  5229  100  5229    0     0  26091      0 --:--:-- --:--:-- --:--:-- 26145
-cation.c
-index d31955b3806..58a05052dc1 100644
---- a/src/libstrongswan/utils/identification.c
-+++ b/src/libstrongswan/utils/identification.c
-@@ -1625,7 +1625,7 @@ static private_identification_t *identification_create(id_type_t type)
- 			this->public.hash = _hash_binary;
- 			this->public.equals = _equals_binary;
- 			this->public.matches = _matches_any;
--			this->public.contains_wildcards = return_true;
-+			this->public.contains_wildcards = (void*)return_true;
- 			break;
- 		case ID_FQDN:
- 		case ID_RFC822_ADDR:
-@@ -1660,13 +1660,13 @@ static private_identification_t *identification_create(id_type_t type)
- 			this->public.hash = _hash_binary;
- 			this->public.equals = _equals_binary;
- 			this->public.matches = _matches_range;
--			this->public.contains_wildcards = return_false;
-+			this->public.contains_wildcards = (void*)return_false;
- 			break;
- 		default:
- 			this->public.hash = _hash_binary;
- 			this->public.equals = _equals_binary;
- 			this->public.matches = _matches_binary;
--			this->public.contains_wildcards = return_false;
-+			this->public.contains_wildcards = (void*)return_false;
- 			break;
- 	}
- 	return this;

strongswan.spec

@@ -30,13 +30,11 @@ Source3:        tmpfiles-strongswan.conf
 Patch0:         strongswan-5.6.0-uintptr_t.patch
 # https://github.com/strongswan/strongswan/issues/1198
 Patch1:         strongswan-5.9.7-error-no-format.patch
-Patch2:         strongswan-6.0.0-gcc15.patch
-Patch3:         strongswan-6.0.1-gcc15.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
@@ -162,7 +160,7 @@ for Strongswan runtime configuration from perl applications.
 
 %build
 # only for snapshots
-autoreconf
+#autoreconf
 
 # --with-ipsecdir moves internal commands to /usr/libexec/strongswan
 # --bindir moves 'pki' command to /usr/libexec/strongswan