From d435af4b0743002d62ee021190c02917fe48ef8c Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Thu, 9 Dec 2021 11:54:51 +0000 Subject: [PATCH] Switch to the development branch of Mbed TLS As per #5637, return to fuzzing the development branch of Mbed TLS. Signed-off-by: Dave Rodgman --- projects/cryptofuzz/Dockerfile | 2 +- projects/cryptofuzz/build.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile index 95b9451ee93e..38d8c57467ed 100644 --- a/projects/cryptofuzz/Dockerfile +++ b/projects/cryptofuzz/Dockerfile @@ -33,7 +33,7 @@ RUN git clone --depth 1 -b oss-fuzz https://github.com/project-everest/hacl-star RUN git clone --depth 1 https://github.com/google/cityhash.git RUN git clone --depth 1 https://github.com/randombit/botan.git RUN git clone --depth 1 https://github.com/wolfSSL/wolfssl.git -RUN git clone --depth 1 -b development_2.x https://github.com/ARMmbed/mbedtls.git +RUN git clone --depth 1 -b development https://github.com/ARMmbed/mbedtls.git RUN hg clone https://hg.mozilla.org/projects/nspr RUN hg clone https://hg.mozilla.org/projects/nss RUN git clone --depth 1 https://github.com/jedisct1/libsodium.git diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh index 30191be85ae3..3a68158e1a52 100755 --- a/projects/cryptofuzz/build.sh +++ b/projects/cryptofuzz/build.sh @@ -316,8 +316,6 @@ scripts/config.pl set MBEDTLS_PLATFORM_MEMORY scripts/config.pl set MBEDTLS_CMAC_C scripts/config.pl set MBEDTLS_NIST_KW_C scripts/config.pl set MBEDTLS_ARIA_C -scripts/config.pl set MBEDTLS_MD2_C -scripts/config.pl set MBEDTLS_MD4_C if [[ $CFLAGS == *sanitize=memory* ]] then scripts/config.pl unset MBEDTLS_HAVE_ASM