From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 4 Jan 2021 13:47:52 +0000 (+0100)
Subject: github: Bump wolfSSL to 4.6.0
X-Git-Tag: 5.9.2dr1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839d6c8f8011fce7f011e66a0f9016ef2fb1b694;p=thirdparty%2Fstrongswan.git

github: Bump wolfSSL to 4.6.0

Also enables Brainpool curves (this only enables the BP curves, while
--enable-ecccustcurves=all would also enable several others we don't support).
---

diff --git a/scripts/test.sh b/scripts/test.sh
index e3f7ca3b48..fcb533f3bd 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -37,7 +37,7 @@ build_botan()
 
 build_wolfssl()
 {
-	WOLFSSL_REV=e9b1ceae7e1d # v4.5.0-stable + big endian fix
+	WOLFSSL_REV=v4.6.0-stable
 	WOLFSSL_DIR=$DEPS_BUILD_DIR/wolfssl
 
 	if test -d "$WOLFSSL_DIR"; then
@@ -46,14 +46,14 @@ build_wolfssl()
 
 	echo "$ build_wolfssl()"
 
-	WOLFSSL_CFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DES_ECB"
+	WOLFSSL_CFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DES_ECB -DHAVE_ECC_BRAINPOOL"
 	WOLFSSL_CONFIG="--prefix=$DEPS_PREFIX
 					--disable-crypttests --disable-examples
 					--enable-keygen --enable-rsapss --enable-aesccm
 					--enable-aesctr --enable-des3 --enable-camellia
 					--enable-curve25519 --enable-ed25519
 					--enable-curve448 --enable-ed448
-					--enable-sha3 --enable-shake256"
+					--enable-sha3 --enable-shake256 --enable-ecccustcurves"
 
 	git clone https://github.com/wolfSSL/wolfssl.git $WOLFSSL_DIR &&
 	cd $WOLFSSL_DIR &&