diff options
| author | Joe George <joe@zeroc.com> | 2016-12-12 11:51:41 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-12-12 11:51:41 -0500 |
| commit | cbbac2c31a04e956261489ce75c962be7e2454ae (patch) | |
| tree | 0b7e452a2943aa3a75880a5a87e233e778602a53 /cpp/src/IceSSL/OpenSSLTransceiverI.cpp | |
| parent | Extra fixes for dependency processing (diff) | |
| download | ice-cbbac2c31a04e956261489ce75c962be7e2454ae.tar.bz2 ice-cbbac2c31a04e956261489ce75c962be7e2454ae.tar.xz ice-cbbac2c31a04e956261489ce75c962be7e2454ae.zip | |
ICE-7445 - Add libressl build support
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 d66c5eb2781..9f070442a30 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 { @@ -156,13 +156,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) |