diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-01-28 17:42:51 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-01-28 17:43:31 +0100 |
| commit | 5899905708d08becfd2d7d7029d53ae8c63b5fcb (patch) | |
| tree | 1b1fa86527deb07f8ab850142959b25a165d888c /cpp/src/IceSSL | |
| parent | Better SSL support for underlying transports that don't provide a socket file... (diff) | |
| download | ice-5899905708d08becfd2d7d7029d53ae8c63b5fcb.tar.bz2 ice-5899905708d08becfd2d7d7029d53ae8c63b5fcb.tar.xz ice-5899905708d08becfd2d7d7029d53ae8c63b5fcb.zip | |
Got rid of calls to SSL_get_fd in OpenSSL IceSSL transport
Diffstat (limited to 'cpp/src/IceSSL')
| -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 9de9a9f53ea..5c5a7390586 100644 --- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp @@ -286,7 +286,7 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal:: { ostringstream ostr; ostr << "SSL error occurred for new " << (_incoming ? "incoming" : "outgoing") - << " connection:\nremote address = " << _delegate->toString() << "\n" << _engine->sslErrors(); + << " connection:\n" << _delegate->toString() << "\n" << _engine->sslErrors(); throw ProtocolException(__FILE__, __LINE__, ostr.str()); } } @@ -345,7 +345,7 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal:: out << "bits = " << SSL_CIPHER_get_bits(cipher, 0) << "\n"; out << "protocol = " << SSL_get_version(_ssl) << "\n"; } - out << IceInternal::fdToString(SSL_get_fd(_ssl)); + out << toString(); } return IceInternal::SocketOperationNone; @@ -828,7 +828,7 @@ OpenSSL::TransceiverI::verifyCallback(int ok, X509_STORE_CTX* c) out << "subject = " << buf << '\n'; out << "depth = " << X509_STORE_CTX_get_error_depth(c) << '\n'; out << "error = " << X509_verify_cert_error_string(err) << '\n'; - out << IceInternal::fdToString(SSL_get_fd(_ssl)); + out << toString(); } // |