testing: Build wolfSSL from the Git repository

Use the same configure options etc. for both builds (no need for the cert
options as we don't use TLS or X.509 parsing) and switch to a Git commit
that includes the SHA-3 OID fix (it's actually the fix itself).

scripts/test.sh

@@ -37,7 +37,7 @@ build_botan()
 
 build_wolfssl()
 {
-	WOLFSSL_REV=v4.7.0-stable
+	WOLFSSL_REV=0caf3ba456f1 # v4.7.1r + SHA-3 fix
 	WOLFSSL_DIR=$DEPS_BUILD_DIR/wolfssl
 
 	if test -d "$WOLFSSL_DIR"; then
@@ -46,14 +46,15 @@ build_wolfssl()
 
 	echo "$ build_wolfssl()"
 
-	WOLFSSL_CFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DES_ECB -DHAVE_ECC_BRAINPOOL"
+	WOLFSSL_CFLAGS="-DWOLFSSL_PUBLIC_MP -DWOLFSSL_DES_ECB -DHAVE_AES_ECB \
+					-DHAVE_ECC_BRAINPOOL -DWOLFSSL_MIN_AUTH_TAG_SZ=8"
 	WOLFSSL_CONFIG="--prefix=$DEPS_PREFIX
 					--disable-crypttests --disable-examples
-					--enable-keygen --enable-rsapss --enable-aesccm
+					--enable-aesccm --enable-aesctr --enable-camellia
-					--enable-aesctr --enable-des3 --enable-camellia
+					--enable-curve25519 --enable-curve448 --enable-des3
-					--enable-curve25519 --enable-ed25519
+					--enable-ecccustcurves --enable-ed25519 --enable-ed448
-					--enable-curve448 --enable-ed448
+					--enable-keygen --enable-md4 --enable-rsapss --enable-sha3
-					--enable-sha3 --enable-shake256 --enable-ecccustcurves"
+					--enable-shake256"
 
 	git clone https://github.com/wolfSSL/wolfssl.git $WOLFSSL_DIR &&
 	cd $WOLFSSL_DIR &&

testing/scripts/recipes/012_wolfssl.mk

@@ -1,10 +1,8 @@
 #!/usr/bin/make
 
 PKG = wolfssl
-REV = 4.7.1r
+SRC = https://github.com/wolfSSL/$(PKG).git
-DIR = $(PKG)-$(REV)
+REV = 0caf3ba456f1 # v4.7.1r + SHA-3 fix
-TAR = v$(REV).tar.gz
-SRC = https://github.com/wolfSSL/$(PKG)/archive/refs/tags/$(TAR)
 
 NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
 
@@ -13,8 +11,7 @@ CFLAGS = \
 	-DWOLFSSL_DES_ECB \
 	-DHAVE_AES_ECB \
 	-DHAVE_ECC_BRAINPOOL \
-	-DWOLFSSL_MIN_AUTH_TAG_SZ=8 \
+	-DWOLFSSL_MIN_AUTH_TAG_SZ=8
-	-DHAVE_EX_DATA
 
 CONFIG_OPTS = \
 	--disable-crypttests \
@@ -22,35 +19,32 @@ CONFIG_OPTS = \
 	--enable-silent-rules \
 	--enable-aesccm \
 	--enable-aesctr \
-	--enable-ecccustcurves \
-	--enable-curve25519 \
-	--enable-ed25519 \
-	--enable-curve448 \
-	--enable-ed448 \
-	--enable-rsapss \
-	--enable-des3 \
-	--enable-sha3 \
-	--enable-shake256 \
-	--enable-md4 \
 	--enable-camellia \
+	--enable-curve25519 \
+	--enable-curve448 \
+	--enable-des3 \
+	--enable-ecccustcurves \
+	--enable-ed25519 \
+	--enable-ed448 \
 	--enable-keygen \
-	--enable-certgen \
+	--enable-md4 \
-	--enable-certreq \
+	--enable-rsapss \
-	--enable-certext \
+	--enable-sha3 \
-	--enable-sessioncerts
+	--enable-shake256
 
 all: install
 
-$(TAR):
+.$(PKG)-cloned:
-	wget $(SRC)
+	[ -d $(PKG) ] || git clone $(SRC) $(PKG)
-
-.$(PKG)-unpacked-$(REV): $(TAR)
-	[ -d $(DIR) ] || tar xf $(TAR)
 	@touch $@
 
-.$(PKG)-built-$(REV): .$(PKG)-unpacked-$(REV)
+.$(PKG)-checkout-$(REV): .$(PKG)-cloned
-	cd $(DIR) && ./autogen.sh && ./configure C_FLAGS="$(CFLAGS)" $(CONFIG_OPTS) && make -j $(NUM_CPUS)
+	cd $(PKG) && git fetch && git checkout $(REV)
+	@rm -f .$(PKG)-checkout-* && touch $@
+
+.$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
+	cd $(PKG) && ./autogen.sh && ./configure C_FLAGS="$(CFLAGS)" $(CONFIG_OPTS) && make -j $(NUM_CPUS)
 	@rm -f .$(PKG)-built-* && touch $@
 
 install: .$(PKG)-built-$(REV)
-	cd $(DIR) && make install && ldconfig
+	cd $(PKG) && make install && ldconfig