19 lines
736 B
Diff
19 lines
736 B
Diff
diff -up Ice-3.3.1/cpp/src/IceSSL/Instance.cpp.openssl Ice-3.3.1/cpp/src/IceSSL/Instance.cpp
|
|
--- Ice-3.3.1/cpp/src/IceSSL/Instance.cpp.openssl 2009-03-20 18:52:14.000000000 +0100
|
|
+++ Ice-3.3.1/cpp/src/IceSSL/Instance.cpp 2009-08-22 17:14:03.000000000 +0200
|
|
@@ -989,7 +989,13 @@ IceSSL::Instance::traceConnection(SSL* s
|
|
{
|
|
Trace out(_logger, _securityTraceCategory);
|
|
out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n";
|
|
- SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
|
+ const SSL_CIPHER *cipher;
|
|
+#else
|
|
+ SSL_CIPHER *cipher;
|
|
+#endif
|
|
+
|
|
+ cipher = SSL_get_current_cipher(ssl);
|
|
if(!cipher)
|
|
{
|
|
out << "unknown cipher\n";
|