Renamed all the Ssl* files. Modified the config/TestUtil.py file to include

    a clientServerHybridTest - handles the test case that client and server
    are BOTH client and server roles.

1 files changed, 17 insertions, 17 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
index 040d6cb0a27..86b44d65b56 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
@@ -10,10 +10,10 @@
 
 #include <string>
 #include <sstream>
-#include <Ice/SslOpenSSLUtils.h>

+#include <Ice/OpenSSLUtils.h>
 #include <Ice/Network.h>
 #include <Ice/OpenSSL.h>
-#include <Ice/SecurityException.h>
+#include <Ice/SslException.h>
 #include <Ice/SslConnectionOpenSSLClient.h>
 
 #include <Ice/TraceLevels.h>
@@ -45,18 +45,18 @@ using std::dec;
 //       but unfortunately, it appears that this is not properly picked up.
 //
 
-IceSSL::OpenSSL::ClientConnection::ClientConnection(

-            const IceInternal::TraceLevelsPtr& traceLevels,

-            const Ice::LoggerPtr& logger,

+IceSSL::OpenSSL::ClientConnection::ClientConnection(
+            const IceInternal::TraceLevelsPtr& traceLevels,
+            const Ice::LoggerPtr& logger,
             const IceSSL::CertificateVerifierPtr& certificateVerifier,
-            SSL* connection,

+            SSL* connection,
             const IceSSL::SystemInternalPtr& system) :
                                             Connection(traceLevels, logger, certificateVerifier, connection, system)
-{

-    assert(_sslConnection != 0);

-

-    // Set the Connect Connection state for this connection.

-    SSL_set_connect_state(_sslConnection);

+{
+    assert(_sslConnection != 0);
+
+    // Set the Connect Connection state for this connection.
+    SSL_set_connect_state(_sslConnection);
 }
 
 IceSSL::OpenSSL::ClientConnection::~ClientConnection()
@@ -72,12 +72,12 @@ IceSSL::OpenSSL::ClientConnection::shutdown()
 int
 IceSSL::OpenSSL::ClientConnection::init(int timeout)
 {
-    assert(_sslConnection != 0);

-

+    assert(_sslConnection != 0);
+
     int retCode = SSL_is_init_finished(_sslConnection);
 
     while (!retCode)
-    {

+    {
         int i = 0;
 
         _readTimeout = timeout > _handshakeReadTimeout ? timeout : _handshakeReadTimeout;
@@ -251,7 +251,7 @@ IceSSL::OpenSSL::ClientConnection::write(Buffer& buf, int timeout)
 
     // We keep reading until we're done
     while (buf.i != buf.b.end())
-    {

+    {
         // Ensure we're initialized.
         initReturn = initialize(timeout);
 
@@ -307,8 +307,8 @@ IceSSL::OpenSSL::ClientConnection::write(Buffer& buf, int timeout)
             }
 
             case SSL_ERROR_WANT_READ:
-            {

-                // TODO: Probably don't need this - remove later if not needed.

+            {
+                // TODO: Probably don't need this - remove later if not needed.
 
                 // If we get this error here, it HAS to be because
                 // the protocol wants to do something handshake related.