(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.30 and 1.33.4.1

version 1.30, 2008/02/22 19:09:14 version 1.33.4.1, 2008/07/01 15:18:01
Line 44 
Line 44 
 #endif #endif
  
 #include <Pegasus/Common/SSLContext.h> #include <Pegasus/Common/SSLContext.h>
 #include <Pegasus/Common/Linkage.h>  
 #include <Pegasus/Common/Mutex.h> #include <Pegasus/Common/Mutex.h>
   #include <Pegasus/Common/Threads.h>
   #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/AutoPtr.h> #include <Pegasus/Common/AutoPtr.h>
 #include <Pegasus/Common/SharedPtr.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
  
 struct FreeX509STOREPtr struct FreeX509STOREPtr
Line 61 
Line 71 
     }     }
 }; };
  
   #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&);
   
       /*
           Initialize the SSL locking and ID callbacks.
       */
       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.
   
           _sslLocks.reset(new Mutex[CRYPTO_num_locks()]);
   
   # if defined(PEGASUS_HAVE_PTHREADS) && !defined(PEGASUS_OS_VMS)
           // Set the ID callback. The ID callback returns a thread ID.
           CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK) pthread_self);
   # endif
   
           // Set the locking callback.
   
           CRYPTO_set_locking_callback(
               (CRYPTO_SET_LOCKING_CALLBACK) _lockingCallback);
       }
   
       /*
           Reset the SSL locking and ID callbacks.
       */
       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 type,
           const char* file,
           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 class SSLCallbackInfoRep
 { {
 public: public:
Line 77 
Line 204 
  
 class SSLContextRep class SSLContextRep
 { {
     /*  
     SSL locking callback function. It is needed to perform locking on  
     shared data structures.  
   
     This function needs access to variable ssl_locks.  
     Declare it as a friend of class SSLContextRep.  
   
     @param mode     Specifies whether to lock/unlock.  
     @param type Type of lock.  
     @param file      File name of the function setting the lock.  
     @param line      Line number of the function setting the lock.  
     */  
     friend void pegasus_locking_callback(  
                       int       mode,  
                       int       type,  
                       const     char* file,  
                       int       line);  
   
 public: public:
  
     /** Constructor for a SSLContextRep object.     /** Constructor for a SSLContextRep object.
Line 142 
Line 251 
  
     SSLCertificateVerifyFunction* getSSLCertificateVerifyFunction() const;     SSLCertificateVerifyFunction* getSSLCertificateVerifyFunction() const;
  
       /**
           Checks if the certificate associated with this SSL context has expired
           or is not yet valid.
           @exception SSLException if the certificate is determined to be invalid.
       */
       void validateCertificate();
   
 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 172 
Line 284 
     SSLCertificateVerifyFunction* _certificateVerifyFunction;     SSLCertificateVerifyFunction* _certificateVerifyFunction;
  
     SharedPtr<X509_STORE, FreeX509STOREPtr> _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.30  
changed lines
  Added in v.1.33.4.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2