testing: Disable deprecated features in Botan

We keep MD5 enabled for now as we need it for TLS 1.0/1.1.  Once we
remove that we can reconsider (although, it's also needed for EAP-MD5
and since MD4 is disabled as well, which means EAP-MSCHAPv2 won't
be available, we'd be left with only EAP-GTC for simple username/password
authentication, which nobody else supports).

diff --git a/scripts/test.sh b/scripts/test.sh
index 7970a1996489762f301ee24e8a909fc9bcb0920b..d9b43ca0797a977e46dfabc1401e936705ad22e6 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -21,8 +21,10 @@ build_botan()
                BOTAN_CONFIG="--without-os-features=threads
                                          --disable-modules=locking_allocator"
        fi
-       # disable some larger modules we don't need for the tests
+       # disable some larger modules we don't need for the tests and deprecated
+       # ones, except for MD5, which we need for TLS 1.0/1.1
        BOTAN_CONFIG="$BOTAN_CONFIG --disable-modules=pkcs11,tls,x509,xmss
+                                 --disable-deprecated-features --enable-modules=md5
                                  --prefix=$DEPS_PREFIX"
 
        git clone https://github.com/randombit/botan.git $BOTAN_DIR &&

diff --git a/testing/scripts/recipes/011_botan.mk b/testing/scripts/recipes/011_botan.mk
index 3488bf3daf75e51a7b8691f69588e7432ea9e431..96e5dd7c3ff75a5d0c47412d719159b04234d68c 100644 (file)
--- a/testing/scripts/recipes/011_botan.mk
+++ b/testing/scripts/recipes/011_botan.mk
@@ -7,10 +7,13 @@ REV = 3.7.1
 NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN)
 
 # the first two are necessary due to LD, the others to reduce the build time
+# the last one enables MD5, which we need for TLS 1.0/1.1 (and possibly EAP-MD5)
 CONFIG_OPTS = \
        --without-os-features=threads \
        --disable-modules=locking_allocator \
-       --disable-modules=pkcs11,tls,x509,xmss
+       --disable-modules=pkcs11,tls,x509,xmss \
+       --disable-deprecated-features \
+       --enable-modules=md5
 
 all: install