Skip to content

Commit 21d3bfa

Browse files
Free space inside the image (#14400)
Signed-off-by: Nikola Pajkovsky <nikolap@openssl.org> Co-authored-by: Nikola Pajkovsky <nikolap@openssl.org>
1 parent 797cb92 commit 21d3bfa

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

projects/openssl/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ FROM gcr.io/oss-fuzz-base/base-builder
1818
RUN apt-get update && apt-get install -y make
1919
RUN git clone --depth 1 https://github.com/openssl/openssl.git
2020
RUN cd $SRC/openssl/ && git submodule update --init fuzz/corpora
21-
RUN git clone --depth 1 --branch openssl-3.0 https://github.com/openssl/openssl.git openssl30
22-
RUN git clone --depth 1 --branch openssl-3.2 https://github.com/openssl/openssl.git openssl32
2321
RUN git clone --depth 1 --branch openssl-3.3 https://github.com/openssl/openssl.git openssl33
2422
RUN git clone --depth 1 --branch openssl-3.4 https://github.com/openssl/openssl.git openssl34
2523
RUN git clone --depth 1 --branch openssl-3.5 https://github.com/openssl/openssl.git openssl35
2624
RUN git clone --depth 1 --branch openssl-3.6 https://github.com/openssl/openssl.git openssl36
27-
RUN cd $SRC/openssl32/ && git submodule update --init fuzz/corpora
2825
RUN cd $SRC/openssl33/ && git submodule update --init fuzz/corpora
2926
RUN cd $SRC/openssl34/ && git submodule update --init fuzz/corpora
3027
RUN cd $SRC/openssl35/ && git submodule update --init fuzz/corpora

projects/openssl/build.sh

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
export FUZZ_INTROSPECTOR_CONFIG=$SRC/openssl/fuzz/fuzz_introspector_exclusion.config
1919

20-
CONFIGURE_FLAGS="--debug enable-fuzz-libfuzzer -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION no-shared enable-tls1_3 enable-rc5 enable-md2 enable-nextprotoneg enable-weak-ssl-ciphers --with-fuzzer-lib=/usr/lib/libFuzzingEngine $CFLAGS -fno-sanitize=alignment enable-unit-test"
20+
CONFIGURE_FLAGS="--debug enable-fuzz-libfuzzer -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION no-shared enable-tls1_3 enable-rc5 enable-md2 enable-nextprotoneg enable-weak-ssl-ciphers --with-fuzzer-lib=/usr/lib/libFuzzingEngine $CFLAGS -fno-sanitize=alignment enable-unit-test no-apps no-tests"
2121
if [[ $CFLAGS = *sanitize=memory* ]]
2222
then
2323
CONFIGURE_FLAGS="$CONFIGURE_FLAGS no-asm"
@@ -45,6 +45,8 @@ function build_fuzzers() {
4545
./config $CONFIGURE_FLAGS
4646
fi
4747

48+
df -h
49+
4850
make -j$(nproc) LDCMD="$CXX $CXXFLAGS"
4951

5052
fuzzers=$(find fuzz -executable -type f '!' -name \*.py '!' -name \*-test '!' -name \*.pl '!' -name \*.sh)
@@ -71,38 +73,26 @@ function build_fuzzers() {
7173
fi
7274
find $SOURCES -type f -a \( -name '*.[ch]' -o -name '*.inc' \) -exec cp --parents '{}' $DESTDIR/ \;
7375
fi
76+
77+
df -h
78+
git clean -dfx
79+
df -h
7480
}
7581

7682
cd $SRC/openssl/
7783
build_fuzzers ""
78-
make clean
7984

8085
# In introspector, indexer builds and when capturing replay builds, only build
8186
# the master branch
8287
if [[ "$SANITIZER" == introspector || -n "${INDEXER_BUILD:-}" || -n "${CAPTURE_REPLAY_SCRIPT:-}" ]]; then
8388
exit 0
8489
fi
8590

86-
cd $SRC/openssl30/
87-
build_fuzzers "_30"
88-
make clean
89-
90-
cd $SRC/openssl32/
91-
build_fuzzers "_32"
92-
make clean
93-
9491
cd $SRC/openssl33/
9592
build_fuzzers "_33"
96-
make clean
97-
9893
cd $SRC/openssl34/
9994
build_fuzzers "_34"
100-
make clean
101-
10295
cd $SRC/openssl35/
10396
build_fuzzers "_35"
104-
make clean
105-
10697
cd $SRC/openssl36/
10798
build_fuzzers "_36"
108-
make clean

projects/openssl/project.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ auto_ccs:
1414
- "viktor@openssl.org"
1515
- "andrewd@openssl.org"
1616
- "nikolap@openssl.org"
17-
- "mbroz@openssl.org"
17+
- "milanb@openssl.org"
1818
sanitizers:
1919
- address
2020
- memory:

0 commit comments

Comments
 (0)