From 952d2c4fd9a4d8f3bcc46a54a67dda3abb60ce1d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 Apr 2026 18:07:04 +0200 Subject: [PATCH] package/strongswan: remove unneeded wolfSSL fix Using this defconfig BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_PACKAGE_STRONGSWAN=y BR2_PACKAGE_STRONGSWAN_WOLFSSL=y applied after 'git reset 10a70b1af67cf79986c2e401f7a54aa850ea82d6 --hard' replicates the build error http://autobuild.buildroot.net/results/278b3f74c48c858ae368d59069752adb69c05246 which was fixed in 2024 by https://gitlab.com/buildroot.org/buildroot/-/commit/89d512729cfa5b2ef5c5165492789ba4441add19 Note: The git tree was reset to the commit right before the fix. Instead of using the fix mentioned above the build error is also fixed when the buildroot commit 6c183754342e6bb73aeab3c8731789c73fcae4ad is cherry-picked onto 10a70b1af67cf79986c2e401f7a54aa850ea82d6. This means the build error mentioned above is really fixed by enabling BR2_PACKAGE_WOLFSSL_ALL. Therefore we can remove the content of commit 89d512729cfa5b2ef5c5165492789ba4441add19. This commit also prevents a build error in strongswan wolfssl_rsa_private_key.c: In function 'create_empty': wolfssl_rsa_private_key.c:450:18: error: 'RsaKey' has no member named 'rng' 450 | this->rsa.rng = &this->rng; caused by the upcoming bump of wolfSSL from 5.7.2 to 5.9.1 due to upstream commit https://github.com/wolfSSL/wolfssl/commit/cd88a8ae88bac13019689c087755d826145811bb which was first included in wolfSSL 5.9.0. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain (cherry picked from commit 5d6378db9dd83d46808cba4538a7412f71f88089) Signed-off-by: Thomas Perale --- package/strongswan/strongswan.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 4185e13288..b79ab83c42 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -85,11 +85,6 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_MARIADB),mariadb) endif -# https://github.com/strongswan/strongswan/issues/2410 -ifeq ($(BR2_PACKAGE_STRONGSWAN_WOLFSSL),y) -STRONGSWAN_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DWC_NO_RNG" -endif - # disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved # problem exist since linux 4.5 header changes STRONGSWAN_CONF_OPTS += \