(file) Return to SSLContextRep.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/SSLContextRep.h between version 1.23.2.1 and 1.31

version 1.23.2.1, 2006/02/10 16:09:38 version 1.31, 2008/02/26 19:24:16
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Nag Boranna, Hewlett-Packard Company ( nagaraja_boranna@hp.com )  
 //  
 // Modified By: Sushma Fernandes, Hewlett-Packard Company (sushma_fernandes@hp.com)  
 //              Heather Sterling, IBM (hsterl@us.ibm.com)  
 //              Aruran, IBM (ashanmug@in.ibm.com) for Bug#4422  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
   #ifndef Pegasus_SSLContextRep_h
   #define Pegasus_SSLContextRep_h
   
 #ifdef PEGASUS_HAS_SSL #ifdef PEGASUS_HAS_SSL
 #define OPENSSL_NO_KRB5 1 #define OPENSSL_NO_KRB5 1
 #include <openssl/err.h> #include <openssl/err.h>
Line 45 
Line 42 
 #else #else
 #define SSL_CTX void #define SSL_CTX void
 #endif #endif
   
 #include <Pegasus/Common/SSLContext.h> #include <Pegasus/Common/SSLContext.h>
 #include <Pegasus/Common/Linkage.h> #include <Pegasus/Common/Linkage.h>
 #include <Pegasus/Common/IPC.h>  #include <Pegasus/Common/Mutex.h>
   #include <Pegasus/Common/Threads.h>
 #ifndef Pegasus_SSLContextRep_h  #include <Pegasus/Common/Tracer.h>
 #define Pegasus_SSLContextRep_h  #include <Pegasus/Common/AutoPtr.h>
   #include <Pegasus/Common/SharedPtr.h>
  
   //
   // Typedef's for OpenSSL callback functions.
   //
   extern "C"
   {
       typedef void (* CRYPTO_SET_LOCKING_CALLBACK)(int, int, const char *, int);
       typedef unsigned long (* CRYPTO_SET_ID_CALLBACK)(void);
   };
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 class SSLCallbackInfoRep  struct FreeX509STOREPtr
 { {
 public:      void operator()(X509_STORE* ptr)
     SSLCertificateVerifyFunction* verifyCertificateCallback;      {
     Array<SSLCertificateInfo*> peerCertificate;  #ifdef PEGASUS_HAS_SSL
     X509_STORE* crlStore;          X509_STORE_free(ptr);
   #endif
       }
 }; };
  
 class PEGASUS_COMMON_LINKAGE SSLContextRep  #ifdef PEGASUS_HAS_SSL
   
   class SSLEnvironmentInitializer
   {
   public:
   
       SSLEnvironmentInitializer()
       {
           AutoMutex autoMut(_instanceCountMutex);
   
           PEG_TRACE((TRC_SSL, Tracer::LEVEL4,
               "In SSLEnvironmentInitializer(), _instanceCount is %d",
               _instanceCount));
   
           if (_instanceCount == 0)
           {
               _initializeCallbacks();
               SSL_load_error_strings();
               SSL_library_init();
           }
   
           _instanceCount++;
       }
   
       ~SSLEnvironmentInitializer()
       {
           AutoMutex autoMut(_instanceCountMutex);
           _instanceCount--;
   
           PEG_TRACE((TRC_SSL, Tracer::LEVEL4,
               "In ~SSLEnvironmentInitializer(), _instanceCount is %d",
               _instanceCount));
   
           if (_instanceCount == 0)
 { {
               ERR_free_strings();
               _uninitializeCallbacks();
           }
       }
   
   private:
   
       SSLEnvironmentInitializer(const SSLEnvironmentInitializer&);
       SSLEnvironmentInitializer& operator=(const SSLEnvironmentInitializer&);
   
     /*     /*
     SSL locking callback function. It is needed to perform locking on          Initialize the SSL locking and ID callbacks.
     shared data structures.      */
       static void _initializeCallbacks()
       {
           PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
               "Initializing SSL callbacks.");
   
           // Allocate Memory for _sslLocks. SSL locks needs to be able to handle
           // up to CRYPTO_num_locks() different mutex locks.
  
     This function needs access to variable ssl_locks.          _sslLocks.reset(new Mutex[CRYPTO_num_locks()]);
     Declare it as a friend of class SSLContextRep.  
  
     @param mode     Specifies whether to lock/unlock.  # if defined(PEGASUS_HAVE_PTHREADS) && !defined(PEGASUS_OS_VMS)
     @param type Type of lock.          // Set the ID callback. The ID callback returns a thread ID.
     @param file      File name of the function setting the lock.          CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK) pthread_self);
     @param line      Line number of the function setting the lock.  # endif
   
           // Set the locking callback.
   
           CRYPTO_set_locking_callback(
               (CRYPTO_SET_LOCKING_CALLBACK) _lockingCallback);
       }
   
       /*
           Reset the SSL locking and ID callbacks.
     */     */
     friend void pegasus_locking_callback(      static void _uninitializeCallbacks()
       {
           PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4, "Resetting SSL callbacks.");
           CRYPTO_set_locking_callback(NULL);
           CRYPTO_set_id_callback(NULL);
           _sslLocks.reset();
       }
   
       static void _lockingCallback(
                       int       mode,                       int       mode,
                       int       type,                       int       type,
                       const     char* file,                       const     char* file,
                       int       line);          int line)
       {
           if (mode & CRYPTO_LOCK)
           {
               _sslLocks.get()[type].lock();
           }
           else
           {
               _sslLocks.get()[type].unlock();
           }
       }
   
       /**
           Locks to be used by SSL.
       */
       static AutoArrayPtr<Mutex> _sslLocks;
   
       /**
           Count of the instances of this class.  The SSL environment must be
           initialized when the first SSLEnvironmentInitializer is constructed.
           It must be uninitialized when the last SSLEnvironmentInitializer is
           destructed.
       */
       static int _instanceCount;
   
       /**
           Mutex for controlling access to _instanceCount.
       */
       static Mutex _instanceCountMutex;
   };
   
   #endif
   
   class SSLCallbackInfoRep
   {
   public:
       SSLCertificateVerifyFunction* verifyCertificateCallback;
       Array<SSLCertificateInfo*> peerCertificate;
       X509_STORE* crlStore;
   
       String ipAddress;
   
       friend class SSLCallback;
   
       friend class SSLCallbackInfo;
   };
  
   class SSLContextRep
   {
 public: public:
  
     /** Constructor for a SSLContextRep object.     /** Constructor for a SSLContextRep object.
Line 122 
Line 244 
  
     String getCRLPath() const;     String getCRLPath() const;
  
     X509_STORE* getCRLStore() const;      SharedPtr<X509_STORE, FreeX509STOREPtr> getCRLStore() const;
  
     void setCRLStore(X509_STORE* store);     void setCRLStore(X509_STORE* store);
  
Line 132 
Line 254 
  
 private: private:
  
   #ifdef PEGASUS_HAS_SSL
       /**
           Ensures that the SSL environment remains initialized for the lifetime
           of the SSLContextRep object.
       */
       SSLEnvironmentInitializer _env;
   #endif
   
     SSL_CTX * _makeSSLContext();     SSL_CTX * _makeSSLContext();
     void _randomInit(const String& randomFile);     void _randomInit(const String& randomFile);
     Boolean _verifyPrivateKey(SSL_CTX *ctx, const String& keyPath);     Boolean _verifyPrivateKey(SSL_CTX *ctx, const String& keyPath);
  
     /*  
     Initialize the SSL locking environment.  
   
     This function sets the locking callback functions.  
     */  
     static void init_ssl();  
   
     /*  
     Cleanup the SSL locking environment.  
     */  
     static void free_ssl();  
   
     String _trustStore;     String _trustStore;
     String _certPath;     String _certPath;
     String _keyPath;     String _keyPath;
Line 159 
Line 277 
  
     SSLCertificateVerifyFunction* _certificateVerifyFunction;     SSLCertificateVerifyFunction* _certificateVerifyFunction;
  
     X509_STORE* _crlStore;      SharedPtr<X509_STORE, FreeX509STOREPtr> _crlStore;
   
     /*  
        Mutex containing the SSL locks.  
     */  
     static AutoArrayPtr<Mutex> _sslLocks;  
   
     /*  
        Count for instances of this class. This is used to initialize and free  
        SSL locking objects.  
     */  
     static int _countRep;  
   
     /*  
        Mutex for countRep.  
     */  
     static Mutex _countRepMutex;  
 }; };
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
  
 #endif /* Pegasus_SSLContextRep_h */ #endif /* Pegasus_SSLContextRep_h */
   

Legend:
Removed from v.1.23.2.1  
changed lines
  Added in v.1.31
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2