strongswan: fix build with wolfSSL 5.9.2

wolfSSL 5.9.2 removed mlkem.h. Backport the upstream change to use
wc_mlkem.h directly.

Fixes: #30291
Signed-off-by: Dharmik Parmar <redacted>

diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index 9b970ff97b6a95c06923107928a064e44a3e894a..43ba6c7775481cc241299c5bb26b6863614a9a84 100644 (file)
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
 PKG_VERSION:=6.0.7
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/

diff --git a/net/strongswan/patches/0905-wolfssl-Adapt-to-removed-ML-KEM-header.patch b/net/strongswan/patches/0905-wolfssl-Adapt-to-removed-ML-KEM-header.patch
new file mode 100644 (file)
index 0000000..c6431cd
--- /dev/null
+++ b/net/strongswan/patches/0905-wolfssl-Adapt-to-removed-ML-KEM-header.patch
@@ -0,0 +1,24 @@
+From 98b133c54c5e3f66f46a5bb11c9b09d06fdc8469 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Fri, 26 Jun 2026 08:10:16 +0200
+Subject: [PATCH] wolfssl: Adapt to removed ML-KEM header
+
+The mlkem.h header that mainly defined aliases for the old wc_Kyber* API
+has been removed and its contents moved to the wc_mlkem.h header.
+---
+ src/libstrongswan/plugins/wolfssl/wolfssl_kem.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/src/libstrongswan/plugins/wolfssl/wolfssl_kem.c
++++ b/src/libstrongswan/plugins/wolfssl/wolfssl_kem.c
+@@ -25,10 +25,7 @@
+ 
+ #ifdef WOLFSSL_HAVE_MLKEM
+ 
+-#include <wolfssl/wolfcrypt/mlkem.h>
+-#ifdef WOLFSSL_WC_MLKEM
+ #include <wolfssl/wolfcrypt/wc_mlkem.h>
+-#endif
+ 
+ typedef struct private_key_exchange_t private_key_exchange_t;
+