diff options
| author | Mark Spruiell <mes@zeroc.com> | 2010-05-31 09:01:25 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2010-05-31 09:01:25 -0700 |
| commit | cca184f3eac855e14e367a264d6fa9725b9bb635 (patch) | |
| tree | 80087e2121895f5f4c679b4f9e1e82dc62616b18 /cpp/src/IceSSL/Instance.cpp | |
| parent | Updated jgoodies versions (diff) | |
| download | ice-cca184f3eac855e14e367a264d6fa9725b9bb635.tar.bz2 ice-cca184f3eac855e14e367a264d6fa9725b9bb635.tar.xz ice-cca184f3eac855e14e367a264d6fa9725b9bb635.zip | |
bug 4762 - IceSSL compile error on Solaris
Diffstat (limited to 'cpp/src/IceSSL/Instance.cpp')
| -rw-r--r-- | cpp/src/IceSSL/Instance.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp index 3f6dea79175..7879e720002 100644 --- a/cpp/src/IceSSL/Instance.cpp +++ b/cpp/src/IceSSL/Instance.cpp @@ -1070,7 +1070,11 @@ IceSSL::Instance::traceConnection(SSL* ssl, bool incoming) Trace out(_logger, _securityTraceCategory); out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n"; - const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); + // + // The const_cast is necesary because Solaris still uses OpenSSL 0.9.7. + // + //const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); + SSL_CIPHER *cipher = const_cast<SSL_CIPHER*>(SSL_get_current_cipher(ssl)); if(!cipher) { out << "unknown cipher\n"; |