mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-08 23:51:08 -09:00
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 reset10a70b1af6--hard' replicates the build error http://autobuild.buildroot.net/results/278b3f74c48c858ae368d59069752adb69c05246 which was fixed in 2024 by89d512729cNote: 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 commit6c18375434is cherry-picked onto10a70b1af6. This means the build error mentioned above is really fixed by enabling BR2_PACKAGE_WOLFSSL_ALL. Therefore we can remove the content of commit89d512729c. 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 commitcd88a8ae88which was first included in wolfSSL 5.9.0. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commit5d6378db9d) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
d7f6575d26
commit
952d2c4fd9
@@ -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 += \
|
||||
|
||||
Reference in New Issue
Block a user