unix format

1 files changed, 206 insertions, 206 deletions

diff --git a/cpp/src/IceSSL/SslConnectionOpenSSL.h b/cpp/src/IceSSL/SslConnectionOpenSSL.h
index 6cf2a501b4b..b7ae891f86b 100644
--- a/cpp/src/IceSSL/SslConnectionOpenSSL.h
+++ b/cpp/src/IceSSL/SslConnectionOpenSSL.h
@@ -1,206 +1,206 @@
-// **********************************************************************

-//

-// Copyright (c) 2001

-// MutableRealms, Inc.

-// Huntsville, AL, USA

-//

-// All Rights Reserved

-//

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

-

-#ifndef ICE_SSL_CONNECTION_OPENSSL_H

-#define ICE_SSL_CONNECTION_OPENSSL_H

-

-#include <IceUtil/Mutex.h>

-#include <IceSSL/SslConnection.h>

-#include <IceSSL/PluginBaseIF.h>

-#include <IceSSL/SslConnectionOpenSSLF.h>

-#include <IceSSL/CertificateVerifierOpenSSL.h>

-#include <IceSSL/TraceLevelsF.h>

-

-#include <openssl/ssl.h>

-

-#include <map>

-

-namespace IceSSL

-{

-

-namespace OpenSSL

-{

-

-class SafeFlag

-{

-public:

-

-    SafeFlag(bool flagVal = false)

-    {

-        _flag = flagVal;

-    }

-

-    ~SafeFlag()

-    {

-    }

-

-    bool checkAndSet()

-    {

-        IceUtil::Mutex::Lock sync(_mutex);

-

-        if(_flag)

-        {

-            return false;

-        }

-        else

-        {

-            _flag = true;

-            return true;

-        }

-    }

-

-    bool check()

-    {

-        IceUtil::Mutex::Lock sync(_mutex);

-        return _flag;

-    }

-

-    void set()

-    {

-        IceUtil::Mutex::Lock sync(_mutex);

-        _flag = true;

-    }

-

-    void unset()

-    {

-        IceUtil::Mutex::Lock sync(_mutex);

-        _flag = false;

-    }

-

-private:

-

-    IceUtil::Mutex _mutex;

-    bool _flag;

-};

-

-class HandshakeSentinel

-{

-public:

-

-    HandshakeSentinel(SafeFlag& handshakeFlag) :

-	_flag(handshakeFlag)

-    {

-        _ownHandshake = _flag.checkAndSet();

-    }

-    

-    ~HandshakeSentinel()

-    { 

-        if(_ownHandshake)

-        {

-            _flag.unset();

-        }

-    }

-

-    bool ownHandshake()

-    {

-        return _ownHandshake;

-    }

-

-private:

-

-    bool _ownHandshake;

-    SafeFlag& _flag;

-};

-

-// NOTE: This is a mapping from SSL* to Connection*, for use with the verifyCallback.

-//       I have purposely not used ConnectionPtr here, as connections register themselves

-//       with this map on construction and unregister themselves in the destructor.  If

-//       this map used ConnectionPtr, Connection instances would never destruct as there

-//       would always be a reference to them from the map.

-typedef std::map<SSL*, Connection*> SslConnectionMap;

-

-typedef enum

-{

-    Handshake,  // The connection is negotiating a connection with the peer.

-    Shutdown,   // The connection is in the process of shutting down.

-    Connected   // The connection is connected - communication may continue.

-} ConnectPhase;

-

-class Connection : public IceSSL::Connection

-{

-public:

-

-    Connection(const IceSSL::CertificateVerifierPtr&,

-               SSL*,

-               const IceSSL::PluginBaseIPtr&);

-    virtual ~Connection();

-

-    virtual int shutdown(int timeout = 0);

-

-    virtual int read(IceInternal::Buffer&, int);

-    virtual int write(IceInternal::Buffer&, int) = 0;

-

-    virtual int handshake(int timeout = 0) = 0;

-

-    void setHandshakeReadTimeout(int timeout);

-

-    static ConnectionPtr getConnection(SSL*);

-

-    // Callback from OpenSSL for purposes of certificate verification

-    int verifyCertificate(int, X509_STORE_CTX*);

-

-protected:

-

-    int connect();

-    int accept();

-    int renegotiate();

-    int initialize(int timeout);

-

-    int pending();

-    int getLastError() const;

-

-    int sslRead(char*, int);

-    int sslWrite(char*, int);

-

-    int select(int, bool);

-    int readSelect(int);

-    int writeSelect(int);

-

-    int readSSL(IceInternal::Buffer&, int);

-

-    static void addConnection(SSL*, Connection*);

-    static void removeConnection(SSL*);

-

-    virtual void showConnectionInfo() = 0;

-

-    void showCertificateChain(BIO*);

-    void showPeerCertificate(BIO*, const char*);

-    void showSharedCiphers(BIO*);

-    void showSessionInfo(BIO*);

-    void showSelectedCipherInfo(BIO*);

-    void showHandshakeStats(BIO*);

-    void showClientCAList(BIO*, const char*);

-

-    void setLastError(int errorCode) { _lastError = errorCode; };

-

-    static SslConnectionMap _connectionMap;

-    static IceUtil::Mutex _connectionRepositoryMutex;

-

-    // Pointer to the OpenSSL Connection structure.

-    SSL* _sslConnection;

-

-    int _lastError;

-

-    IceUtil::Mutex _handshakeWaitMutex;

-

-    SafeFlag _handshakeFlag;

-    int _initWantRead;

-    int _initWantWrite;

-    int _handshakeReadTimeout;

-    int _readTimeout;

-

-    ConnectPhase _phase;

-};

-

-}

-

-}

-

-#endif

+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_SSL_CONNECTION_OPENSSL_H
+#define ICE_SSL_CONNECTION_OPENSSL_H
+
+#include <IceUtil/Mutex.h>
+#include <IceSSL/SslConnection.h>
+#include <IceSSL/PluginBaseIF.h>
+#include <IceSSL/SslConnectionOpenSSLF.h>
+#include <IceSSL/CertificateVerifierOpenSSL.h>
+#include <IceSSL/TraceLevelsF.h>
+
+#include <openssl/ssl.h>
+
+#include <map>
+
+namespace IceSSL
+{
+
+namespace OpenSSL
+{
+
+class SafeFlag
+{
+public:
+
+    SafeFlag(bool flagVal = false)
+    {
+        _flag = flagVal;
+    }
+
+    ~SafeFlag()
+    {
+    }
+
+    bool checkAndSet()
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+
+        if(_flag)
+        {
+            return false;
+        }
+        else
+        {
+            _flag = true;
+            return true;
+        }
+    }
+
+    bool check()
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+        return _flag;
+    }
+
+    void set()
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+        _flag = true;
+    }
+
+    void unset()
+    {
+        IceUtil::Mutex::Lock sync(_mutex);
+        _flag = false;
+    }
+
+private:
+
+    IceUtil::Mutex _mutex;
+    bool _flag;
+};
+
+class HandshakeSentinel
+{
+public:
+
+    HandshakeSentinel(SafeFlag& handshakeFlag) :
+	_flag(handshakeFlag)
+    {
+        _ownHandshake = _flag.checkAndSet();
+    }
+    
+    ~HandshakeSentinel()
+    { 
+        if(_ownHandshake)
+        {
+            _flag.unset();
+        }
+    }
+
+    bool ownHandshake()
+    {
+        return _ownHandshake;
+    }
+
+private:
+
+    bool _ownHandshake;
+    SafeFlag& _flag;
+};
+
+// NOTE: This is a mapping from SSL* to Connection*, for use with the verifyCallback.
+//       I have purposely not used ConnectionPtr here, as connections register themselves
+//       with this map on construction and unregister themselves in the destructor.  If
+//       this map used ConnectionPtr, Connection instances would never destruct as there
+//       would always be a reference to them from the map.
+typedef std::map<SSL*, Connection*> SslConnectionMap;
+
+typedef enum
+{
+    Handshake,  // The connection is negotiating a connection with the peer.
+    Shutdown,   // The connection is in the process of shutting down.
+    Connected   // The connection is connected - communication may continue.
+} ConnectPhase;
+
+class Connection : public IceSSL::Connection
+{
+public:
+
+    Connection(const IceSSL::CertificateVerifierPtr&,
+               SSL*,
+               const IceSSL::PluginBaseIPtr&);
+    virtual ~Connection();
+
+    virtual int shutdown(int timeout = 0);
+
+    virtual int read(IceInternal::Buffer&, int);
+    virtual int write(IceInternal::Buffer&, int) = 0;
+
+    virtual int handshake(int timeout = 0) = 0;
+
+    void setHandshakeReadTimeout(int timeout);
+
+    static ConnectionPtr getConnection(SSL*);
+
+    // Callback from OpenSSL for purposes of certificate verification
+    int verifyCertificate(int, X509_STORE_CTX*);
+
+protected:
+
+    int connect();
+    int accept();
+    int renegotiate();
+    int initialize(int timeout);
+
+    int pending();
+    int getLastError() const;
+
+    int sslRead(char*, int);
+    int sslWrite(char*, int);
+
+    int select(int, bool);
+    int readSelect(int);
+    int writeSelect(int);
+
+    int readSSL(IceInternal::Buffer&, int);
+
+    static void addConnection(SSL*, Connection*);
+    static void removeConnection(SSL*);
+
+    virtual void showConnectionInfo() = 0;
+
+    void showCertificateChain(BIO*);
+    void showPeerCertificate(BIO*, const char*);
+    void showSharedCiphers(BIO*);
+    void showSessionInfo(BIO*);
+    void showSelectedCipherInfo(BIO*);
+    void showHandshakeStats(BIO*);
+    void showClientCAList(BIO*, const char*);
+
+    void setLastError(int errorCode) { _lastError = errorCode; };
+
+    static SslConnectionMap _connectionMap;
+    static IceUtil::Mutex _connectionRepositoryMutex;
+
+    // Pointer to the OpenSSL Connection structure.
+    SSL* _sslConnection;
+
+    int _lastError;
+
+    IceUtil::Mutex _handshakeWaitMutex;
+
+    SafeFlag _handshakeFlag;
+    int _initWantRead;
+    int _initWantWrite;
+    int _handshakeReadTimeout;
+    int _readTimeout;
+
+    ConnectPhase _phase;
+};
+
+}
+
+}
+
+#endif