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/Util.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/Util.cpp')
| -rwxr-xr-x | cpp/src/IceSSL/Util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 0c227c7e279..f6fd6a92563 100755 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -131,7 +131,7 @@ namespace { # ifndef OPENSSL_NO_DH -# if OPENSSL_VERSION_NUMBER < 0x10100000L +# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) // The following arrays are predefined Diffie Hellman group parameters. // These are known strong primes, distributed with the OpenSSL library @@ -359,7 +359,7 @@ unsigned char dh4096[] = // // Convert a predefined parameter set into a DH value. // -# if OPENSSL_VERSION_NUMBER >= 0x10100000L +# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) static DH* convertDH(const unsigned char* buf, int len) { @@ -449,7 +449,7 @@ IceSSL::DHParams::get(int keyLength) // No match found. Use one of the predefined parameter sets instead. // IceUtil::Mutex::Lock sync(*this); -# if OPENSSL_VERSION_NUMBER >= 0x10100000L +# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) if(keyLength >= 4096) { if(!_dh4096) |