(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.33.4.1 and 1.40

version 1.33.4.1, 2008/07/01 15:18:01 version 1.40, 2012/12/13 14:38:55
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; Symantec Corporation; The Open Group.  
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // Permission is hereby granted, free of charge, to any person obtaining a
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 // //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   //
   //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 61 
Line 59 
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
   #ifdef PEGASUS_HAS_SSL
 struct FreeX509STOREPtr struct FreeX509STOREPtr
 { {
     void operator()(X509_STORE* ptr)     void operator()(X509_STORE* ptr)
     {     {
 #ifdef PEGASUS_HAS_SSL  
         X509_STORE_free(ptr);         X509_STORE_free(ptr);
 #endif  
     }     }
 }; };
   #else
   struct FreeX509STOREPtr
   {
       void operator()(X509_STORE*)
       {
       }
   };
   #endif
   
  
 #ifdef PEGASUS_HAS_SSL #ifdef PEGASUS_HAS_SSL
  
Line 129 
Line 135 
  
         _sslLocks.reset(new Mutex[CRYPTO_num_locks()]);         _sslLocks.reset(new Mutex[CRYPTO_num_locks()]);
  
 # if defined(PEGASUS_HAVE_PTHREADS) && !defined(PEGASUS_OS_VMS)  #ifdef PEGASUS_HAVE_PTHREADS
         // Set the ID callback. The ID callback returns a thread ID.         // Set the ID callback. The ID callback returns a thread ID.
   # ifdef PEGASUS_OS_VMS
           CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK) _getThreadId);
   # else
         CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK) pthread_self);         CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK) pthread_self);
 # endif # endif
   #endif
  
         // Set the locking callback.         // Set the locking callback.
  
Line 140 
Line 150 
             (CRYPTO_SET_LOCKING_CALLBACK) _lockingCallback);             (CRYPTO_SET_LOCKING_CALLBACK) _lockingCallback);
     }     }
  
   #if defined(PEGASUS_OS_VMS) && defined(PEGASUS_HAVE_PTHREADS)
       static unsigned long _getThreadId(void)
       {
           return pthread_getsequence_np(pthread_self());
       }
   #endif
     /*     /*
         Reset the SSL locking and ID callbacks.         Reset the SSL locking and ID callbacks.
     */     */
Line 154 
Line 170 
     static void _lockingCallback(     static void _lockingCallback(
         int mode,         int mode,
         int type,         int type,
         const char* file,          const char*,
         int line)          int)
     {     {
         if (mode & CRYPTO_LOCK)         if (mode & CRYPTO_LOCK)
         {         {
Line 202 
Line 218 
     friend class SSLCallbackInfo;     friend class SSLCallbackInfo;
 }; };
  
 class SSLContextRep  class PEGASUS_COMMON_LINKAGE SSLContextRep
 { {
 public: public:
  
Line 223 
Line 239 
         const String& keyPath = String::EMPTY,         const String& keyPath = String::EMPTY,
         const String& crlPath = String::EMPTY,         const String& crlPath = String::EMPTY,
         SSLCertificateVerifyFunction* verifyCert = NULL,         SSLCertificateVerifyFunction* verifyCert = NULL,
         const String& randomFile = String::EMPTY);          const String& randomFile = String::EMPTY,
           const String& cipherSuite = String::EMPTY);
  
     SSLContextRep(const SSLContextRep& sslContextRep);     SSLContextRep(const SSLContextRep& sslContextRep);
  
Line 237 
Line 254 
  
     String getKeyPath() const;     String getKeyPath() const;
  
       String getCipherSuite() const;
   
 #ifdef PEGASUS_USE_DEPRECATED_INTERFACES #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
     String getTrustStoreUserName() const;     String getTrustStoreUserName() const;
 #endif #endif
Line 277 
Line 296 
     String _keyPath;     String _keyPath;
     String _crlPath;     String _crlPath;
     String _randomFile;     String _randomFile;
       String _cipherSuite;
     SSL_CTX * _sslContext;     SSL_CTX * _sslContext;
  
     Boolean _verifyPeer;     Boolean _verifyPeer;


Legend:
Removed from v.1.33.4.1  
changed lines
  Added in v.1.40

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2