summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2022-08-19 15:48:34 +0200
committerPauli <pauli@openssl.org>2022-08-23 10:17:36 +1000
commit53d1eeef0f6794f38267114acb270b9059bc2c17 (patch)
tree0ca0e90ce1f382a80ce90748b3715721c1a1ce26 /.github
parent4e75ba97a2edaaf4aa7d2a34b74e4d59a2ae1c2c (diff)
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) (cherry picked from commit 83529f07ca66ec288f1c506a673569b9d8de8368)
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--.github/workflows/fuzz-checker.yml4
-rw-r--r--.github/workflows/run-checker-merge.yml2
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 533f3bbec6..29a502a8d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -144,7 +144,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: config
- run: ./config --banner=Configured --debug enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-fips -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 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION && perl configdata.pm --dump
- name: make
run: make -s -j4
- name: make test
diff --git a/.github/workflows/fuzz-checker.yml b/.github/workflows/fuzz-checker.yml
index 9e5627fd03..2347ebae41 100644
--- a/.github/workflows/fuzz-checker.yml
+++ b/.github/workflows/fuzz-checker.yml
@@ -25,7 +25,7 @@ jobs:
cc: afl-clang-fast
}, {
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,
install: libfuzzer-12-dev,
cc: clang-12,
@@ -33,7 +33,7 @@ jobs:
tests: -test_memleak
}, {
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,
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,
diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml
index dcc9d0d15f..82f3b29b0e 100644
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -25,7 +25,7 @@ jobs:
no-engine no-shared,
no-err,
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,
enable-weak-ssl-ciphers,
enable-zlib,