diff options
| author |  Janos Follath <janos.follath@arm.com> | 2019-06-04 16:13:23 +0100 |
|---|---|---|
| committer |  Abhishek Arya <inferno@chromium.org> | 2019-06-04 08:13:23 -0700 |
| commit | 54733ddc84ec73e3c21d6fffc446dbd0fa7a2c5e (patch) | |
| tree | 5d735a99b026fb41958e0af2e8a0b30c0f4e84cf | |
| parent | eb6be0506e798b796fb3772b1c8e3554741b07cd (diff) | |
Fix a build failure in bignum fuzzer when building the Mbed TLS module (#2487)
* [bignum-fuzzer] Clone Mbed TLS recursively
The cryptography library of Mbed TLS has been moved to a separate
repository. It is now included into the project as a git submodule and
therefore we need to clone Mbed TLS recursively.
* [bignum-fuzzer] Use new Mbed TLS library location
The bignum module in Mbed TLS as part of the cryptography library has
been moved to a new location. This commit sets the corresponding paths
to their new values.
| -rw-r--r-- | projects/bignum-fuzzer/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/bignum-fuzzer/build.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/projects/bignum-fuzzer/Dockerfile b/projects/bignum-fuzzer/Dockerfile index cc31b61f..4dbd6c32 100644 --- a/projects/bignum-fuzzer/Dockerfile +++ b/projects/bignum-fuzzer/Dockerfile @@ -26,5 +26,5 @@ RUN git clone --depth 1 https://github.com/guidovranken/bignum-fuzzer RUN git clone --depth 1 https://github.com/openssl/openssl RUN hg clone https://gmplib.org/repo/gmp/ libgmp/ RUN git clone https://boringssl.googlesource.com/boringssl -RUN git clone --depth 1 https://github.com/ARMmbed/mbedtls +RUN git clone --recursive --depth 1 https://github.com/ARMmbed/mbedtls COPY build.sh $SRC/ diff --git a/projects/bignum-fuzzer/build.sh b/projects/bignum-fuzzer/build.sh index cef336d1..75e63080 100755 --- a/projects/bignum-fuzzer/build.sh +++ b/projects/bignum-fuzzer/build.sh @@ -98,7 +98,7 @@ LIBFUZZER_LINK="$LIB_FUZZING_ENGINE" make cp $SRC/bignum-fuzzer/fuzzer $OUT/fuzzer_openssl_libgmp_num_len_1200_all_operations_num_loops_1 # Build mbedtls -cd $SRC/mbedtls +cd $SRC/mbedtls/crypto make lib -j$(nproc) # Build BoringSSL @@ -115,7 +115,7 @@ CFLAGS="$CFLAGS -DBIGNUM_FUZZER_BORINGSSL" OPENSSL_INCLUDE_PATH=$SRC/boringssl/i # Build mbedtls module cd $SRC/bignum-fuzzer/modules/mbedtls -MBEDTLS_LIBMBEDCRYPTO_A_PATH=$SRC/mbedtls/library/libmbedcrypto.a MBEDTLS_INCLUDE_PATH=$SRC/mbedtls/include make +MBEDTLS_LIBMBEDCRYPTO_A_PATH=$SRC/mbedtls/crypto/library/libmbedcrypto.a MBEDTLS_INCLUDE_PATH=$SRC/mbedtls/crypto/include make # Build BoringSSL/mbedtls fuzzer cd $SRC/bignum-fuzzer |