diff options
Diffstat (limited to 'cpp/src/Ice/SslConnectionOpenSSLClient.cpp')
-rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSLClient.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp index e3d0bfa7b7b..8937baeae53 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp @@ -11,7 +11,7 @@ #include <string> #include <sstream> #include <Ice/Network.h> -#include <Ice/OpenSSL.h>
+#include <Ice/OpenSSL.h> #include <Ice/SecurityException.h> #include <Ice/SslConnectionOpenSSLClient.h> @@ -20,6 +20,8 @@ using IceSecurity::Ssl::ShutdownException; using IceSecurity::Ssl::SystemPtr; +using Ice::ConnectionLostException; +using Ice::SocketException; using namespace IceInternal; using namespace std; @@ -37,8 +39,8 @@ using std::dec; // Public Methods // -IceSecurity::Ssl::OpenSSL::ClientConnection::ClientConnection(const CertificateVerifierPtr& certificateVerifier,
- SSL* connection,
+IceSecurity::Ssl::OpenSSL::ClientConnection::ClientConnection(const CertificateVerifierPtr& certificateVerifier, + SSL* connection, const SystemPtr& system) : Connection(certificateVerifier, connection, system) { @@ -154,7 +156,7 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::init(int timeout) // Protocol Error: Unexpected EOF protocolEx._message = "Encountered an EOF during handshake that violates the SSL Protocol.\n"; - protocolEx._message += sslGetErrors();
+ protocolEx._message += sslGetErrors(); throw protocolEx; } @@ -165,7 +167,7 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::init(int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx._message = "Encountered a violation of the SSL Protocol during handshake.\n"; - protocolEx._message += sslGetErrors();
+ protocolEx._message += sslGetErrors(); throw protocolEx; } @@ -344,7 +346,7 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::write(Buffer& buf, int timeout) // Protocol Error: Unexpected EOF protocolEx._message = "Encountered an EOF that violates the SSL Protocol.\n"; - protocolEx._message += sslGetErrors();
+ protocolEx._message += sslGetErrors(); throw protocolEx; } @@ -360,7 +362,7 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::write(Buffer& buf, int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx._message = "Encountered a violation of the SSL Protocol.\n"; - protocolEx._message += sslGetErrors();
+ protocolEx._message += sslGetErrors(); throw protocolEx; } |