diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-25 13:13:22 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-25 13:13:22 +0100 |
| commit | dcdc32af1fced49d80a8ccd93230e15d91ab45d8 (patch) | |
| tree | eb69e2555fbd54496fce8a33f4dd610e1473ff51 /cpp/src/IceSSL | |
| parent | C# IceSSL/configuration log expired certificate exceptions. (diff) | |
| download | ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.bz2 ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.xz ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.zip | |
Refactored test scripts
Diffstat (limited to 'cpp/src/IceSSL')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLEngine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp index 84238614220..8a6af245907 100644 --- a/cpp/src/IceSSL/OpenSSLEngine.cpp +++ b/cpp/src/IceSSL/OpenSSLEngine.cpp @@ -50,7 +50,7 @@ extern "C" { // -// OpenSSL 1.1.0 introduces a new thread API and removes +// OpenSSL 1.1.0 introduces a new thread API and removes // the need to use a custom thread callback. // #if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -151,7 +151,7 @@ public: ~Init() { // - // OpenSSL 1.1.0 introduces a new thread API and removes + // OpenSSL 1.1.0 introduces a new thread API and removes // the need to use a custom thread callback. // #if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -162,7 +162,7 @@ public: delete[] locks; locks = 0; } - + if(CRYPTO_get_id_callback() == IceSSL_opensslThreadIdCallback) { CRYPTO_set_id_callback(0); |