merging from plugins branch

1 files changed, 85 insertions, 0 deletions

diff --git a/cpp/src/IceSSL/ContextOpenSSLClient.cpp b/cpp/src/IceSSL/ContextOpenSSLClient.cpp
new file mode 100644
index 00000000000..dfc204684e7
--- /dev/null
+++ b/cpp/src/IceSSL/ContextOpenSSLClient.cpp
@@ -0,0 +1,85 @@
+// **********************************************************************
+//
+// Copyright (c) 2002
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#include <Ice/TraceLevels.h>
+#include <Ice/Logger.h>
+
+#include <IceSSL/Exception.h>
+#include <IceSSL/SslConnectionOpenSSL.h>
+#include <IceSSL/ContextOpenSSLClient.h>
+#include <IceSSL/SslConnectionOpenSSLClient.h>
+
+using namespace std;
+
+using IceSSL::ConnectionPtr;
+
+void
+IceSSL::OpenSSL::ClientContext::configure(const GeneralConfig& generalConfig,
+                                          const CertificateAuthority& certificateAuthority,
+                                          const BaseCertificates& baseCertificates)
+{
+    Context::configure(generalConfig, certificateAuthority, baseCertificates);
+
+    loadCertificateAuthority(certificateAuthority);
+
+    if (_traceLevels->security >= IceSSL::SECURITY_PROTOCOL)
+    {
+        ostringstream s;
+
+        s << endl;
+        s << "general configuration (client)" << endl;
+        s << "------------------------------" << endl;
+        s << generalConfig << endl << endl;
+
+        s << "certificate authority (client)" << endl;
+        s << "------------------------------" << endl;
+        s << "file: " << certificateAuthority.getCAFileName() << endl;
+        s << "path: " << certificateAuthority.getCAPath() << endl;
+
+        s << "base certificates (client)" << endl;
+        s << "--------------------------" << endl;
+        s << baseCertificates << endl;
+
+        _logger->trace(_traceLevels->securityCat, s.str());
+    }
+}
+
+IceSSL::ConnectionPtr
+IceSSL::OpenSSL::ClientContext::createConnection(int socket, const PluginBaseIPtr& plugin)
+{
+    if (_sslContext == 0)
+    {
+        IceSSL::OpenSSL::ContextNotConfiguredException contextEx(__FILE__, __LINE__);
+
+        throw contextEx;
+    }
+
+    ConnectionPtr connection = new ClientConnection(_traceLevels,
+                                                    _logger,
+                                                    _certificateVerifier,
+                                                    createSSLConnection(socket),
+                                                    plugin);
+
+    connectionSetup(connection);
+
+    return connection;
+}
+
+IceSSL::OpenSSL::ClientContext::ClientContext(const IceInternal::InstancePtr& instance) :
+    Context(instance)
+{
+    _rsaPrivateKeyProperty = "IceSSL.Client.Overrides.RSA.PrivateKey";
+    _rsaPublicKeyProperty  = "IceSSL.Client.Overrides.RSA.Certificate";
+    _dsaPrivateKeyProperty = "IceSSL.Client.Overrides.DSA.PrivateKey";
+    _dsaPublicKeyProperty  = "IceSSL.Client.Overrides.DSA.Certificate";
+    _caCertificateProperty = "IceSSL.Client.Overrides.CACertificate";
+    _handshakeTimeoutProperty = "IceSSL.Client.Handshake.ReadTimeout";
+    _passphraseRetriesProperty = "IceSSL.Client.Passphrase.Retries";
+}