mirror of https://github.com/openssl/openssl
Always automatically add -DPEDANTIC with enable-ubsan
To avoid reports like: #19028 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19029)
This commit is contained in:
parent
a148f864a8
commit
83529f07ca
|
@ -144,7 +144,7 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: config
|
- name: config
|
||||||
run: ./config --banner=Configured --debug enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-fips enable-quic -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DPEDANTIC && perl configdata.pm --dump
|
run: ./config --banner=Configured --debug enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-fips enable-quic -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION && perl configdata.pm --dump
|
||||||
- name: make
|
- name: make
|
||||||
run: make -s -j4
|
run: make -s -j4
|
||||||
- name: make test
|
- name: make test
|
||||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
cc: afl-clang-fast
|
cc: afl-clang-fast
|
||||||
}, {
|
}, {
|
||||||
name: libFuzzer,
|
name: libFuzzer,
|
||||||
config: enable-fuzz-libfuzzer -DPEDANTIC enable-asan enable-ubsan,
|
config: enable-fuzz-libfuzzer enable-asan enable-ubsan,
|
||||||
libs: --with-fuzzer-lib=/usr/lib/llvm-12/lib/libFuzzer.a --with-fuzzer-include=/usr/lib/llvm-12/build/lib/clang/12.0.0/include/fuzzer,
|
libs: --with-fuzzer-lib=/usr/lib/llvm-12/lib/libFuzzer.a --with-fuzzer-include=/usr/lib/llvm-12/build/lib/clang/12.0.0/include/fuzzer,
|
||||||
install: libfuzzer-12-dev,
|
install: libfuzzer-12-dev,
|
||||||
cc: clang-12,
|
cc: clang-12,
|
||||||
|
@ -33,7 +33,7 @@ jobs:
|
||||||
tests: -test_memleak
|
tests: -test_memleak
|
||||||
}, {
|
}, {
|
||||||
name: libFuzzer+,
|
name: libFuzzer+,
|
||||||
config: enable-fuzz-libfuzzer -DPEDANTIC enable-asan enable-ubsan -fsanitize-coverage=trace-cmp -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION,
|
config: enable-fuzz-libfuzzer enable-asan enable-ubsan -fsanitize-coverage=trace-cmp -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION,
|
||||||
libs: --with-fuzzer-lib=/usr/lib/llvm-12/lib/libFuzzer.a --with-fuzzer-include=/usr/lib/llvm-12/build/lib/clang/12.0.0/include/fuzzer,
|
libs: --with-fuzzer-lib=/usr/lib/llvm-12/lib/libFuzzer.a --with-fuzzer-include=/usr/lib/llvm-12/build/lib/clang/12.0.0/include/fuzzer,
|
||||||
extra: enable-fips enable-ec_nistp_64_gcc_128 -fno-sanitize=alignment enable-tls1_3 enable-weak-ssl-ciphers enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg,
|
extra: enable-fips enable-ec_nistp_64_gcc_128 -fno-sanitize=alignment enable-tls1_3 enable-weak-ssl-ciphers enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg,
|
||||||
install: libfuzzer-12-dev,
|
install: libfuzzer-12-dev,
|
||||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
no-engine no-shared,
|
no-engine no-shared,
|
||||||
no-err,
|
no-err,
|
||||||
no-filenames,
|
no-filenames,
|
||||||
enable-ubsan no-asm -DPEDANTIC -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=alignment,
|
enable-ubsan no-asm -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=alignment,
|
||||||
no-unit-test,
|
no-unit-test,
|
||||||
enable-weak-ssl-ciphers,
|
enable-weak-ssl-ciphers,
|
||||||
enable-zlib,
|
enable-zlib,
|
||||||
|
|
|
@ -1509,9 +1509,7 @@ unless ($disabled{asan} || defined $detected_sanitizers{asan}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
unless ($disabled{ubsan} || defined $detected_sanitizers{ubsan}) {
|
unless ($disabled{ubsan} || defined $detected_sanitizers{ubsan}) {
|
||||||
# -DPEDANTIC or -fnosanitize=alignment may also be required on some
|
push @{$config{cflags}}, "-fsanitize=undefined", "-fno-sanitize-recover=all", "-DPEDANTIC";
|
||||||
# platforms.
|
|
||||||
push @{$config{cflags}}, "-fsanitize=undefined", "-fno-sanitize-recover=all";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unless ($disabled{msan} || defined $detected_sanitizers{msan}) {
|
unless ($disabled{msan} || defined $detected_sanitizers{msan}) {
|
||||||
|
|
Loading…
Reference in New Issue