diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-11-20 11:14:58 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-11-20 11:14:58 +0000 |
| commit | 31773f157bf8164364649b5f470f52dece0a4317 (patch) | |
| tree | 33d0f7eef45303ab68cf08ab381ce5e5e36c5240 /contrib/libs/openssl | |
| parent | 2c7938962d8689e175574fc1e817c05049f27905 (diff) | |
| parent | eff600952d5dfe17942f38f510a8ac2b203bb3a5 (diff) | |
| download | ydb-31773f157bf8164364649b5f470f52dece0a4317.tar.gz | |
Merge branch 'rightlib' into mergelibs-241120-1113
Diffstat (limited to 'contrib/libs/openssl')
| -rw-r--r-- | contrib/libs/openssl/.yandex_meta/__init__.py | 5 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ubsan.supp | 3 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/contrib/libs/openssl/.yandex_meta/__init__.py b/contrib/libs/openssl/.yandex_meta/__init__.py index b1e69b9c4c..08770e451d 100644 --- a/contrib/libs/openssl/.yandex_meta/__init__.py +++ b/contrib/libs/openssl/.yandex_meta/__init__.py @@ -31,6 +31,10 @@ def post_install(self): m.SRCS = {P.relpath(s, "crypto") for s in m.SRCS} m.SRCS -= {"dso/dso_dlfcn.c", "rand/rand_vms.c"} + # Add suppression for ubsan, see also https://github.com/openssl/openssl/issues/22896 + with self.yamakes["crypto"] as m: + m.after("NO_RUNTIME", "SUPPRESSIONS(ubsan.supp)") + self.yamakes["crypto"].PEERDIR.add("library/cpp/sanitizer/include") self.yamakes["apps"].PEERDIR.add("library/cpp/sanitizer/include") @@ -142,6 +146,7 @@ openssl = NixProject( "asm/windows/", "openssl.package.json", "sanitizers.h", + "crypto/ubsan.supp", ], post_install=post_install, ) diff --git a/contrib/libs/openssl/crypto/ubsan.supp b/contrib/libs/openssl/crypto/ubsan.supp new file mode 100644 index 0000000000..bc65760319 --- /dev/null +++ b/contrib/libs/openssl/crypto/ubsan.supp @@ -0,0 +1,3 @@ +# clang17-rt and later emits diagnostig related to invalid function pointers +# See also https://github.com/openssl/openssl/issues/22896 +function:*contrib/libs/openssl/*.c diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index f588d9ff98..3bf6f03bdb 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -92,6 +92,8 @@ NO_COMPILER_WARNINGS() NO_RUNTIME() +SUPPRESSIONS(ubsan.supp) + CFLAGS( -DOPENSSL_BN_ASM_MONT -DOPENSSL_CPUID_OBJ |