diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-02-14 00:51:34 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-02-14 00:51:34 +0000 |
| commit | 7c59c24919f9e86614d1cd19c62829e01dd54097 (patch) | |
| tree | d42e64eb38c0388a0f4f3ad148bad8938324e279 /contrib/libs | |
| parent | 28180f60aec6dcb2b662b6417c90226553ebe2dc (diff) | |
| parent | c26bb8abd161c590e8cb0e7280a14c335c1eb893 (diff) | |
| download | ydb-7c59c24919f9e86614d1cd19c62829e01dd54097.tar.gz | |
Merge branch 'rightlib' into merge-libs-250214-0050
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/poco/Crypto/include/Poco/Crypto/OpenSSLInitializer.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/contrib/libs/poco/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/contrib/libs/poco/Crypto/include/Poco/Crypto/OpenSSLInitializer.h index 1fbd7d3a2c..694406acc9 100644 --- a/contrib/libs/poco/Crypto/include/Poco/Crypto/OpenSSLInitializer.h +++ b/contrib/libs/poco/Crypto/include/Poco/Crypto/OpenSSLInitializer.h @@ -28,6 +28,16 @@ #endif +#ifndef POCO_CRYPT_NO_SANITIZE_THREAD + #define POCO_CRYPT_NO_SANITIZE_THREAD + #if defined(__has_feature) + #if __has_feature(thread_sanitizer) + #undef POCO_CRYPT_NO_SANITIZE_THREAD + #define POCO_CRYPT_NO_SANITIZE_THREAD __attribute__((no_sanitize_thread)) + #endif + #endif +#endif + extern "C" { struct CRYPTO_dynlock_value @@ -50,14 +60,14 @@ class Crypto_API OpenSSLInitializer public: OpenSSLInitializer(); /// Automatically initialize OpenSSL on startup. - + ~OpenSSLInitializer(); /// Automatically shut down OpenSSL on exit. - - static void initialize(); + + POCO_CRYPT_NO_SANITIZE_THREAD static void initialize(); /// Initializes the OpenSSL machinery. - static void uninitialize(); + POCO_CRYPT_NO_SANITIZE_THREAD static void uninitialize(); /// Shuts down the OpenSSL machinery. static bool isFIPSEnabled(); @@ -71,7 +81,7 @@ protected: { SEEDSIZE = 256 }; - + // OpenSSL multithreading support static void lock(int mode, int n, const char* file, int line); static unsigned long id(); |