diff options
| author | Jose <jose@zeroc.com> | 2016-12-14 12:59:21 -0800 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-14 12:59:21 -0800 |
| commit | b650952f6306594c4cd28e5f2ee76b9907e5024e (patch) | |
| tree | eab1852e9a9ffb4cfff2ea40ca0158e9c7f3dd7d /cpp/src/IceSSL/OpenSSLTransceiverI.cpp | |
| parent | Fix for JS workers tests (diff) | |
| parent | Fix for dependency parsing (diff) | |
| download | ice-b650952f6306594c4cd28e5f2ee76b9907e5024e.tar.bz2 ice-b650952f6306594c4cd28e5f2ee76b9907e5024e.tar.xz ice-b650952f6306594c4cd28e5f2ee76b9907e5024e.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLTransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp index d3195e2b141..863b758791d 100644 --- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp @@ -36,7 +36,7 @@ using namespace IceSSL; // // See: http://cvs.openssl.org/chngview?cn=22569 // -#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) namespace { @@ -170,13 +170,13 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B // // See: http://cvs.openssl.org/chngview?cn=22569 // -#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(sslMutex); #endif int ret = _incoming ? SSL_accept(_ssl) : SSL_connect(_ssl); -#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) sync.release(); #endif if(ret <= 0) |