Skip to content

Commit

Permalink
Switch Mbed TLS to stable branch
Browse files Browse the repository at this point in the history
The `development` branch of Mbed TLS will have some API-breaking
changes in the next few months, in preparation for the next major
release (see
https://lists.trustedfirmware.org/archives/list/mbed-tls@lists.trustedfirmware.org/thread/RHZSQLKCBOPDXS7NFKY5FATMTBYV7D5J/).
To avoid breaking fuzzers, temporarily point them at the `mbedtls-3.6`
long-term support branch. We will go back to fuzzing the `development`
branch before the 4.0 release (Mbed-TLS/mbedtls#9071).

Do not change ecc-diff-fuzzer because
https://oss-fuzz-build-logs.storage.googleapis.com/index.html#ecc-diff-fuzzer
shows that its build has been broken since 2024-01-13.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
  • Loading branch information
gilles-peskine-arm committed Apr 30, 2024
1 parent f895bc7 commit 6114b63
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion projects/bignum-fuzzer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y \
# or a Rust toolchain.
RUN pip3 install 'pip>=20'

RUN git clone --depth 1 --recurse-submodules -b development https://github.com/Mbed-TLS/mbedtls
RUN git clone --depth 1 --recurse-submodules -b mbedtls-3.6 https://github.com/Mbed-TLS/mbedtls
# Install Python packages from PyPI
RUN pip3 install -r $SRC/mbedtls/scripts/basic.requirements.txt

Expand Down
2 changes: 1 addition & 1 deletion projects/cryptofuzz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ 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 https://github.com/wolfSSL/wolfsm
RUN git clone --depth 1 --recurse-submodules -b development https://github.com/Mbed-TLS/mbedtls.git
RUN git clone --depth 1 --recurse-submodules -b mbedtls-3.6 https://github.com/Mbed-TLS/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
Expand Down
2 changes: 1 addition & 1 deletion projects/mbedtls/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \
# or a Rust toolchain.
RUN pip3 install 'pip>=20'

RUN git clone --recursive --depth 1 -b development https://github.com/Mbed-TLS/mbedtls.git mbedtls
RUN git clone --recursive --depth 1 -b mbedtls-3.6 https://github.com/Mbed-TLS/mbedtls.git mbedtls
RUN pip3 install -r $SRC/mbedtls/scripts/basic.requirements.txt

RUN git clone --depth 1 https://github.com/google/boringssl.git boringssl
Expand Down

0 comments on commit 6114b63

Please sign in to comment.