diff options
| author | Mark Spruiell <mes@zeroc.com> | 2010-04-05 10:53:55 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2010-04-05 10:53:55 -0700 |
| commit | a17c6792a98af5dacb5ce901cf41a7f211a5082d (patch) | |
| tree | ebde2d4b139d23a2fee93e3d5751dcf308d4b79c /cpp/src/IceSSL/Instance.cpp | |
| parent | bug 4708 - Python communicator leak (diff) | |
| download | ice-a17c6792a98af5dacb5ce901cf41a7f211a5082d.tar.bz2 ice-a17c6792a98af5dacb5ce901cf41a7f211a5082d.tar.xz ice-a17c6792a98af5dacb5ce901cf41a7f211a5082d.zip | |
another OpenSSL fix
Diffstat (limited to 'cpp/src/IceSSL/Instance.cpp')
| -rw-r--r-- | cpp/src/IceSSL/Instance.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp index cefe5f27be8..98628408360 100644 --- a/cpp/src/IceSSL/Instance.cpp +++ b/cpp/src/IceSSL/Instance.cpp @@ -1064,13 +1064,8 @@ IceSSL::Instance::traceConnection(SSL* ssl, bool incoming) { Trace out(_logger, _securityTraceCategory); out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n"; -#if OPENSSL_VERSION_NUMBER >= 0x10000000L - const SSL_CIPHER *cipher; -#else - SSL_CIPHER *cipher; -#endif - cipher = SSL_get_current_cipher(ssl); + const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); if(!cipher) { out << "unknown cipher\n"; |