diff options
| author | Guido Vranken <guidovranken@users.noreply.github.com> | 2020-07-06 22:53:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 13:53:50 -0700 |
| commit | 11a0f516cd61472055eb073e19dc63e5807ef194 (patch) | |
| tree | 198bf7668b5e874b99379f6f5cdb6c2fc72c38b5 /projects/cryptofuzz | |
| parent | ecc80ba61356c2f0f2c2279b429e4cc0b4e51d3a (diff) | |
| download | oss-fuzz-11a0f516cd61472055eb073e19dc63e5807ef194.tar.gz | |
[cryptofuzz] Build script updates (#4072)
* [cryptofuzz] Build script updates
- Update mbed TLS repository location
- mbed TLS: Enable components disabled by default
- wolfCrypt: Build AES key wrap ciphers
* [cryptofuzz] Add Marina Polubelovam to CC list
Diffstat (limited to 'projects/cryptofuzz')
| -rw-r--r-- | projects/cryptofuzz/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/cryptofuzz/build.sh | 15 | ||||
| -rw-r--r-- | projects/cryptofuzz/project.yaml | 1 |
3 files changed, 12 insertions, 6 deletions
diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile index 545987050..e859cab0c 100644 --- a/projects/cryptofuzz/Dockerfile +++ b/projects/cryptofuzz/Dockerfile @@ -42,7 +42,7 @@ RUN git clone --depth 1 https://github.com/google/cityhash.git RUN git clone --depth 1 https://github.com/golang/go 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 https://github.com/ARMmbed/mbed-crypto.git +RUN git clone --depth 1 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 04a89876d..4bbdc8a45 100755 --- a/projects/cryptofuzz/build.sh +++ b/projects/cryptofuzz/build.sh @@ -148,9 +148,14 @@ cd $SRC/cryptofuzz/modules/cryptopp make -B ############################################################################## -# Compile mbed crypto -cd $SRC/mbed-crypto/ +# Compile mbed TLS +cd $SRC/mbedtls/ 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 @@ -161,8 +166,8 @@ mkdir build/ cd build/ cmake .. -DENABLE_PROGRAMS=0 -DENABLE_TESTING=0 make -j$(nproc) >/dev/null 2>&1 -export MBEDTLS_LIBMBEDCRYPTO_A_PATH="$SRC/mbed-crypto/build/library/libmbedcrypto.a" -export MBEDTLS_INCLUDE_PATH="$SRC/mbed-crypto/include" +export MBEDTLS_LIBMBEDCRYPTO_A_PATH="$SRC/mbedtls/build/library/libmbedcrypto.a" +export MBEDTLS_INCLUDE_PATH="$SRC/mbedtls/include" export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_MBEDTLS" # Compile Cryptofuzz mbed crypto module cd $SRC/cryptofuzz/modules/mbedtls @@ -326,7 +331,7 @@ fi cd $SRC/wolfssl autoreconf -ivf -export WOLFCRYPT_CONFIGURE_PARAMS="--enable-static --enable-md2 --enable-md4 --enable-ripemd --enable-blake2 --enable-blake2s --enable-pwdbased --enable-scrypt --enable-hkdf --enable-cmac --enable-arc4 --enable-camellia --enable-rabbit --enable-aesccm --enable-aesctr --enable-hc128 --enable-xts --enable-des3 --enable-idea --enable-x963kdf --enable-harden --enable-aescfb --enable-aesofb" +export WOLFCRYPT_CONFIGURE_PARAMS="--enable-static --enable-md2 --enable-md4 --enable-ripemd --enable-blake2 --enable-blake2s --enable-pwdbased --enable-scrypt --enable-hkdf --enable-cmac --enable-arc4 --enable-camellia --enable-rabbit --enable-aesccm --enable-aesctr --enable-hc128 --enable-xts --enable-des3 --enable-idea --enable-x963kdf --enable-harden --enable-aescfb --enable-aesofb --enable-aeskeywrap" if [[ $CFLAGS = *sanitize=memory* ]] then diff --git a/projects/cryptofuzz/project.yaml b/projects/cryptofuzz/project.yaml index 91b002b16..ee27959f3 100644 --- a/projects/cryptofuzz/project.yaml +++ b/projects/cryptofuzz/project.yaml @@ -30,6 +30,7 @@ auto_ccs: - "tvandermerwe@mozilla.com" - "matthias.st.pierre@gmail.com" - "kaleb.himes@gmail.com" + - "polubelovam@gmail.com" sanitizers: - address - undefined |