summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/SystemOpenSSL.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/SystemOpenSSL.h')
-rw-r--r--cpp/src/Ice/SystemOpenSSL.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/cpp/src/Ice/SystemOpenSSL.h b/cpp/src/Ice/SystemOpenSSL.h
index 0b8a70c16b4..8536c3e1301 100644
--- a/cpp/src/Ice/SystemOpenSSL.h
+++ b/cpp/src/Ice/SystemOpenSSL.h
@@ -10,9 +10,9 @@
#ifndef ICE_SSL_SYSTEM_OPENSSL_H
#define ICE_SSL_SYSTEM_OPENSSL_H
-#include <Ice/Config.h>
+#include <Ice/Config.h>
#include <Ice/TraceLevelsF.h>
-#include <Ice/LoggerF.h>
+#include <Ice/LoggerF.h>
#include <IceUtil/RecMutex.h>
#include <Ice/GeneralConfig.h>
@@ -31,9 +31,9 @@
#include <openssl/ssl.h>
#include <string>
#include <map>
-
-#include <Ice/RSAPrivateKeyF.h>
-#include <Ice/DHParamsF.h>
+
+#include <Ice/RSAPrivateKeyF.h>
+#include <Ice/DHParamsF.h>
namespace IceSSL
{
@@ -42,9 +42,9 @@ class GeneralConfig;
namespace OpenSSL
{
-
-typedef std::map<int,RSAPrivateKeyPtr> RSAMap;
-typedef std::map<int,DHParamsPtr> DHMap;
+
+typedef std::map<int,RSAPrivateKeyPtr> RSAMap;
+typedef std::map<int,DHParamsPtr> DHMap;
typedef std::map<int,CertificateDesc> RSACertMap;
typedef std::map<int,DiffieHellmanParamsFile> DHParamsMap;
@@ -74,8 +74,8 @@ public:
virtual void addTrustedCertificateBase64(ContextType, const std::string&);
- virtual void addTrustedCertificate(ContextType, const Ice::ByteSeq&);
-
+ virtual void addTrustedCertificate(ContextType, const Ice::ByteSeq&);
+
virtual void setRSAKeysBase64(ContextType, const std::string&, const std::string&);
virtual void setRSAKeys(ContextType, const Ice::ByteSeq&, const Ice::ByteSeq&);
@@ -89,11 +89,11 @@ private:
ServerContext _serverContext;
ClientContext _clientContext;
-
- // Mutex to ensure synchronization of calls to configure
- // the contexts and calls to create connections.
+
+ // Mutex to ensure synchronization of calls to configure
+ // the contexts and calls to create connections.
::IceUtil::RecMutex _configMutex;
-
+
// Keep a cache of all temporary RSA keys.
RSAMap _tempRSAKeys;
::IceUtil::Mutex _tempRSAKeysMutex;