From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 25 Apr 2025 06:26:58 +0000 (+0200)
Subject: Use wolfSSL 5.8.0 for tests
X-Git-Tag: 6.0.2dr1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1a477528f13b4572bc8fe5b2f2b0ff3b94afab8;p=thirdparty%2Fstrongswan.git

Use wolfSSL 5.8.0 for tests
---

diff --git a/scripts/test.sh b/scripts/test.sh
index 31d58875c4..3e79456cba 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -37,7 +37,7 @@ build_botan()
 
 build_wolfssl()
 {
-	WOLFSSL_REV=v5.7.4-stable
+	WOLFSSL_REV=v5.8.0-stable
 	WOLFSSL_DIR=$DEPS_BUILD_DIR/wolfssl
 
 	if test -d "$WOLFSSL_DIR"; then
@@ -54,7 +54,7 @@ build_wolfssl()
 					--enable-aesccm --enable-aesctr --enable-camellia
 					--enable-curve25519 --enable-curve448 --enable-des3
 					--enable-ecccustcurves --enable-ed25519 --enable-ed448
-					--enable-keygen --enable-kyber --with-max-rsa-bits=8192
+					--enable-keygen --enable-mlkem --with-max-rsa-bits=8192
 					--enable-md4 --enable-rsapss --enable-sha3 --enable-shake256"
 
 	git clone https://github.com/wolfSSL/wolfssl.git $WOLFSSL_DIR &&
diff --git a/testing/scripts/recipes/012_wolfssl.mk b/testing/scripts/recipes/012_wolfssl.mk
index 70e4033a76..1d4c8c8d6d 100644
--- a/testing/scripts/recipes/012_wolfssl.mk
+++ b/testing/scripts/recipes/012_wolfssl.mk
@@ -2,7 +2,7 @@
 
 PKG = wolfssl
 SRC = https://github.com/wolfSSL/$(PKG).git
-REV = v5.7.4-stable
+REV = v5.8.0-stable
 
 NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
 
@@ -26,8 +26,8 @@ CONFIG_OPTS = \
 	--enable-ed25519 \
 	--enable-ed448 \
 	--enable-keygen \
-	--enable-kyber \
 	--enable-md4 \
+	--enable-mlkem \
 	--enable-rsapss \
 	--enable-sha3 \
 	--enable-shake256 \
@@ -40,7 +40,7 @@ all: install
 	@touch $@
 
 .$(PKG)-checkout-$(REV): .$(PKG)-cloned
-	cd $(PKG) && git fetch --tags && git checkout $(REV)
+	cd $(PKG) && git fetch -f --tags && git checkout $(REV)
 	@rm -f .$(PKG)-checkout-* && touch $@
 
 .$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)