Updates to fix a problem with multiple copies of

    SslCertificateVerifierOpenSSL.h, parameters update in
    test/Glacier/stater/run.py and namespace issues.

9 files changed, 48 insertions, 68 deletions

diff --git a/cpp/src/Ice/SslCertificateVerifierOpenSSL.cpp b/cpp/src/Ice/SslCertificateVerifierOpenSSL.cpp
index 91479d5e880..924efcaf720 100644
--- a/cpp/src/Ice/SslCertificateVerifierOpenSSL.cpp
+++ b/cpp/src/Ice/SslCertificateVerifierOpenSSL.cpp
@@ -14,3 +14,15 @@ IceSecurity::Ssl::OpenSSL::CertificateVerifier::~CertificateVerifier()
 {

 }

 

+void

+IceInternal::incRef(::IceSecurity::Ssl::OpenSSL::CertificateVerifier* p)

+{

+    p->__incRef();

+}

+

+void

+IceInternal::decRef(::IceSecurity::Ssl::OpenSSL::CertificateVerifier* p)

+{

+    p->__decRef();

+}

+

diff --git a/cpp/src/Ice/SslCertificateVerifierOpenSSL.h b/cpp/src/Ice/SslCertificateVerifierOpenSSL.h
deleted file mode 100644
index 58257ee91f8..00000000000
--- a/cpp/src/Ice/SslCertificateVerifierOpenSSL.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// **********************************************************************

-//

-// Copyright (c) 2001

-// MutableRealms, Inc.

-// Huntsville, AL, USA

-//

-// All Rights Reserved

-//

-// **********************************************************************

-

-#ifndef ICE_SSL_CERTIFICATE_VERIFIER_OPENSSL_H

-#define ICE_SSL_CERTIFICATE_VERIFIER_OPENSSL_H

-

-#include <Ice/SslCertificateVerifier.h>

-#include <openssl/ssl.h>

-

-#ifdef WIN32

-#   ifdef ICE_API_EXPORTS

-#       define ICE_API __declspec(dllexport)

-#   else

-#       define ICE_API __declspec(dllimport)

-#   endif

-#else

-#   define ICE_API /**/

-#endif

-

-namespace IceSecurity

-{

-

-namespace Ssl

-{

-

-namespace OpenSSL

-{

-

-class ICE_API CertificateVerifier : public IceSecurity::Ssl::CertificateVerifier

-{

-

-public:

-    virtual ~CertificateVerifier();

-

-    virtual int verify(int, X509_STORE_CTX*, SSL*) = 0;

-};

-

-}

-

-}

-

-}

-

-#endif

-

-

diff --git a/cpp/src/Ice/SslConnection.h b/cpp/src/Ice/SslConnection.h
index 444acd4213f..5623d4505c2 100644
--- a/cpp/src/Ice/SslConnection.h
+++ b/cpp/src/Ice/SslConnection.h
@@ -27,7 +27,7 @@ namespace Ssl
 class Connection : public IceUtil::Shared
 {
 public:
-    Connection(const CertificateVerifierPtr&);
+    Connection(const IceSecurity::Ssl::CertificateVerifierPtr&);
     virtual ~Connection();
 
     virtual void shutdown() = 0;
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp
index 3f64a2891f3..f7f5a33a4d3 100644
--- a/cpp/src/Ice/SslConnectionOpenSSL.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp
@@ -163,9 +163,15 @@ IceSecurity::Ssl::OpenSSL::SslConnectionMap IceSecurity::Ssl::OpenSSL::Connectio
 void ::IceInternal::incRef(::IceSecurity::Ssl::OpenSSL::Connection* p) { p->__incRef(); }
 void ::IceInternal::decRef(::IceSecurity::Ssl::OpenSSL::Connection* p) { p->__decRef(); }
 
-IceSecurity::Ssl::OpenSSL::Connection::Connection(const CertificateVerifierPtr& certificateVerifier,
-                                                  SSL* sslConnection,
-                                                  const SystemPtr& system) :
+// Note: I would use a using directive of the form:
+//       using IceSecurity::Ssl::CertificateVerifierPtr;
+//       but unfortunately, it appears that this is not properly picked up.
+//
+
+IceSecurity::Ssl::OpenSSL::Connection::Connection(
+            const IceSecurity::Ssl::CertificateVerifierPtr& certificateVerifier,
+            SSL* sslConnection,
+            const SystemPtr& system) :
                                       IceSecurity::Ssl::Connection(certificateVerifier),
                                       _sslConnection(sslConnection),
                                       _system(system)
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.h b/cpp/src/Ice/SslConnectionOpenSSL.h
index 351c555a663..ddd5467cdfb 100644
--- a/cpp/src/Ice/SslConnectionOpenSSL.h
+++ b/cpp/src/Ice/SslConnectionOpenSSL.h
@@ -134,7 +134,7 @@ class Connection : public IceSecurity::Ssl::Connection
 {
 public:
 
-    Connection(const CertificateVerifierPtr&, SSL*, const SystemPtr&);
+    Connection(const IceSecurity::Ssl::CertificateVerifierPtr&, SSL*, const SystemPtr&);
     virtual ~Connection();
 
     virtual void shutdown();
diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
index 8937baeae53..45917272ceb 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
@@ -39,10 +39,17 @@ using std::dec;
 // Public Methods
 //
 
-IceSecurity::Ssl::OpenSSL::ClientConnection::ClientConnection(const CertificateVerifierPtr& certificateVerifier,
-                                                              SSL* connection,
-                                                              const SystemPtr& system) :
-                                            Connection(certificateVerifier, connection, system)
+// Note: I would use a using directive of the form:
+//       using IceSecurity::Ssl::CertificateVerifierPtr;
+//       but unfortunately, it appears that this is not properly picked up.
+//
+
+IceSecurity::Ssl::OpenSSL::ClientConnection::ClientConnection(
+            const IceSecurity::Ssl::CertificateVerifierPtr& certificateVerifier,
+            SSL* connection,
+            const SystemPtr& system) :
+                                            Connection(certificateVerifier,
+                                                       connection, system)
 {
 }
 
diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.h b/cpp/src/Ice/SslConnectionOpenSSLClient.h
index fdf0e6c0779..1ed809c758b 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.h
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.h
@@ -26,7 +26,7 @@ class ClientConnection : public Connection
 {
 
 public:
-    ClientConnection(const CertificateVerifierPtr&, SSL*, const IceSecurity::Ssl::SystemPtr&);
+    ClientConnection(const IceSecurity::Ssl::CertificateVerifierPtr&, SSL*, const IceSecurity::Ssl::SystemPtr&);
     virtual ~ClientConnection();
     virtual void shutdown();
     virtual int init(int timeout = 0);
diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
index c9c05900ff2..54497011d7b 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp
@@ -41,10 +41,18 @@ using std::dec;
 // Public Methods
 //
 
-IceSecurity::Ssl::OpenSSL::ServerConnection::ServerConnection(const CertificateVerifierPtr& certificateVerifier,
-                                                              SSL* connection,
-                                                              const SystemPtr& system) :
-                                            Connection(certificateVerifier, connection, system)
+// Note: I would use a using directive of the form:
+//       using IceSecurity::Ssl::CertificateVerifierPtr;
+//       but unfortunately, it appears that this is not properly picked up.
+//
+
+IceSecurity::Ssl::OpenSSL::ServerConnection::ServerConnection(
+            const IceSecurity::Ssl::CertificateVerifierPtr& certificateVerifier,
+            SSL* connection,
+            const SystemPtr& system) :
+                                            Connection(certificateVerifier,
+                                                       connection,
+                                                       system)
 {
 }
 
diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.h b/cpp/src/Ice/SslConnectionOpenSSLServer.h
index ae348a6d2a2..09675377236 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLServer.h
+++ b/cpp/src/Ice/SslConnectionOpenSSLServer.h
@@ -26,7 +26,7 @@ class ServerConnection : public Connection
 {
 
 public:
-    ServerConnection(const CertificateVerifierPtr&, SSL*, const IceSecurity::Ssl::SystemPtr&);
+    ServerConnection(const IceSecurity::Ssl::CertificateVerifierPtr&, SSL*, const IceSecurity::Ssl::SystemPtr&);
     virtual ~ServerConnection();
     virtual void shutdown();
     virtual int init(int timeout = 0);