blob: 07b0ef876d04f6be744a5c149161f1d7247dc0b5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
diff '--color=auto' -urN thrift-0.23.0.orig/lib/cpp/src/thrift/transport/TSSLSocket.cpp thrift-0.23.0/lib/cpp/src/thrift/transport/TSSLSocket.cpp
--- thrift-0.23.0.orig/lib/cpp/src/thrift/transport/TSSLSocket.cpp 2026-04-29 22:19:18.304809605 +0200
+++ thrift-0.23.0/lib/cpp/src/thrift/transport/TSSLSocket.cpp 2026-04-29 22:20:49.370004107 +0200
@@ -157,18 +157,6 @@
#endif
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
- // Do nothing unless an openssl derivative is detected
-# if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_IS_AWSLC)
- // https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_thread_stop.html
- OPENSSL_thread_stop();
-# endif
-#else
- // ERR_remove_state() was deprecated in OpenSSL 1.0.0 and ERR_remove_thread_state()
- // was deprecated in OpenSSL 1.1.0; these functions and should not be used.
- // https://www.openssl.org/docs/manmaster/man3/ERR_remove_state.html
- ERR_remove_state(0);
-#endif
ERR_free_strings();
mutexes.reset();
@@ -398,18 +386,6 @@
SSL_free(ssl_);
ssl_ = nullptr;
handshakeCompleted_ = false;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
- // Do nothing unless an openssl derivative is detected
-# if !defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_IS_AWSLC)
- // https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_thread_stop.html
- OPENSSL_thread_stop();
-# endif
-#else
- // ERR_remove_state() was deprecated in OpenSSL 1.0.0 and ERR_remove_thread_state()
- // was deprecated in OpenSSL 1.1.0; these functions and should not be used.
- // https://www.openssl.org/docs/manmaster/man3/ERR_remove_state.html
- ERR_remove_state(0);
-#endif
}
TSocket::close();
}
|
