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

Diff for /pegasus/src/Pegasus/Common/SSLContext.cpp between version 1.39 and 1.72

version 1.39, 2004/10/17 20:39:17 version 1.72, 2006/08/22 17:49:09
Line 1 
Line 1 
 //%2004////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 6 
Line 6 
 // IBM Corp.; EMC Corporation, The Open Group. // IBM Corp.; EMC Corporation, The Open Group.
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // 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 copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 32 
Line 36 
 //              Sushma Fernandes, Hewlett-Packard Company (sushma_fernandes@hp.com) //              Sushma Fernandes, Hewlett-Packard Company (sushma_fernandes@hp.com)
 //              Heather Sterling, IBM (hsterl@us.ibm.com) //              Heather Sterling, IBM (hsterl@us.ibm.com)
 //              Amit K Arora, IBM (amita@in.ibm.com) for Bug#1090 //              Amit K Arora, IBM (amita@in.ibm.com) for Bug#1090
   //              David Dillard, Symantec Corp. (david_dillard@symantec.com)
   //              Aruran, IBM (ashanmug@in.ibm.com) for Bug#4422
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #ifdef PEGASUS_HAS_SSL #ifdef PEGASUS_HAS_SSL
   
   #include <Pegasus/Common/Config.h>
   
   #include "Network.h"
   
 #define OPENSSL_NO_KRB5 1 #define OPENSSL_NO_KRB5 1
 #include <openssl/err.h> #include <openssl/err.h>
 #include <openssl/ssl.h> #include <openssl/ssl.h>
Line 43 
Line 54 
 #else #else
 #define SSL_CTX void #define SSL_CTX void
 #endif // end of PEGASUS_HAS_SSL #endif // end of PEGASUS_HAS_SSL
 #include <Pegasus/Common/Destroyer.h>  
 #include <Pegasus/Common/Socket.h> #include <Pegasus/Common/Socket.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <time.h> #include <time.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n #include <Pegasus/Common/MessageLoader.h> //l10n
   #include <Pegasus/Common/Formatter.h>
  
 #include "SSLContext.h" #include "SSLContext.h"
 #include "SSLContextRep.h" #include "SSLContextRep.h"
  
   #ifdef PEGASUS_OS_OS400
   #include "SSLWrapperOS400.h"
   #endif
  
 // //
 // Typedef's for OpenSSL callback functions. // Typedef's for OpenSSL callback functions.
Line 63 
Line 77 
     typedef unsigned long (* CRYPTO_SET_ID_CALLBACK)(void);     typedef unsigned long (* CRYPTO_SET_ID_CALLBACK)(void);
 }; };
  
   typedef struct x509_store_ctx_st X509_STORE_CTX;
  
 typedef struct Timestamp typedef struct Timestamp
 { {
Line 90 
Line 105 
 // //
 #ifdef PEGASUS_HAS_SSL #ifdef PEGASUS_HAS_SSL
  
 // Mutex for SSL locks.  // Mutex for SSL locks which will get initialized by AutoArrayPtr constructor.
 Mutex* SSLContextRep::_sslLocks = 0;  AutoArrayPtr<Mutex> SSLContextRep::_sslLocks;
  
 // Mutex for _countRep. // Mutex for _countRep.
 Mutex SSLContextRep::_countRepMutex; Mutex SSLContextRep::_countRepMutex;
Line 180 
Line 195 
 } }
  
 // //
 // Static class used to define C++ callback function.  // Static class used to define C++ callback functions for OpenSSL.
 // //
 class SSLCallback class SSLCallback
 { {
  
 public: public:
         static int callback(int preVerifyOk, X509_STORE_CTX *ctx);      static int verificationCallback(int preVerifyOk, X509_STORE_CTX *ctx);
       static int verificationCRLCallback(int ok, X509_STORE_CTX *ctx, X509_STORE* sslCRLStore);
 }; };
  
 // //
 // Callback function that is called by the OpenSSL library. This function // Callback function that is called by the OpenSSL library. This function
   // checks whether the certificate is listed in any of the CRL's
   //
   // return 1 if revoked, 0 otherwise
   //
   int SSLCallback::verificationCRLCallback(int ok, X509_STORE_CTX *ctx, X509_STORE* sslCRLStore)
   {
       PEG_METHOD_ENTER(TRC_SSL, "SSLCallback::verificationCRLCallback");
   
       char buf[1024];
   
       //check whether a CRL store was specified
       if (sslCRLStore == NULL)
       {
           PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "---> SSL: CRL store is NULL");
           PEG_METHOD_EXIT();
           return 0;
       }
   
       //get the current certificate info
       X509* currentCert;
       X509_NAME* issuerName;
       X509_NAME* subjectName;
       ASN1_INTEGER* serialNumber;
   
       currentCert = X509_STORE_CTX_get_current_cert(ctx);
       subjectName = X509_get_subject_name(currentCert);
       issuerName = X509_get_issuer_name(currentCert);
       serialNumber = X509_get_serialNumber(currentCert);
   
       //log certificate information
       //this is information in the "public" key, so it does no harm to log it
       X509_NAME_oneline(issuerName, buf, sizeof(buf));
       PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: Certificate Data: Issuer/Subject");
       PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, buf);
       X509_NAME_oneline(subjectName, buf, sizeof(buf));
       PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, buf);
   
       //initialize the CRL store
       X509_STORE_CTX crlStoreCtx;
       X509_STORE_CTX_init(&crlStoreCtx, sslCRLStore, NULL, NULL);
   
       PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: Initialized CRL store");
   
       //attempt to get a CRL issued by the certificate's issuer
       X509_OBJECT obj;
       if (X509_STORE_get_by_subject(&crlStoreCtx, X509_LU_CRL, issuerName, &obj) <= 0)
       {
           PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "---> SSL: No CRL by that issuer");
           PEG_METHOD_EXIT();
           return 0;
       }
       X509_STORE_CTX_cleanup(&crlStoreCtx);
   
       //get CRL
       X509_CRL* crl = obj.data.crl;
       if (crl == NULL)
       {
           PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL is null");
           PEG_METHOD_EXIT();
           return 0;
       } else
       {
           PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: Found CRL by that issuer");
       }
   
       //get revoked certificates
       STACK_OF(X509_REVOKED)* revokedCerts = NULL;
       revokedCerts = X509_CRL_get_REVOKED(crl);
       int numRevoked = sk_X509_REVOKED_num(revokedCerts);
       Tracer::trace(TRC_SSL, Tracer::LEVEL4,"---> SSL: Number of certificates revoked by the issuer %d\n", numRevoked);
   
       //check whether the subject's certificate is revoked
       X509_REVOKED* revokedCert = NULL;
       for (int i = 0; i < sk_X509_REVOKED_num(revokedCerts); i++)
       {
           revokedCert = (X509_REVOKED *)sk_value(X509_CRL_get_REVOKED(crl), i);
   
           //a matching serial number indicates revocation
           if (ASN1_INTEGER_cmp(revokedCert->serialNumber, serialNumber) == 0)
           {
               PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2, "---> SSL: Certificate is revoked");
               X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REVOKED);
               PEG_METHOD_EXIT();
               return 1;
           }
       }
   
       PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: Certificate is not revoked at this level");
   
       PEG_METHOD_EXIT();
       return 0;
   }
   
   //
   // Callback function that is called by the OpenSSL library. This function
 // extracts X509 certficate information and pass that on to client application // extracts X509 certficate information and pass that on to client application
 // callback function. // callback function.
   // We HAVE to build the certificate in all cases since it's needed to get the associated username out of the repository
   // later in the transaction
 // //
 int SSLCallback::callback(int preVerifyOk, X509_STORE_CTX *ctx)  int SSLCallback::verificationCallback(int preVerifyOk, X509_STORE_CTX *ctx)
 { {
     PEG_METHOD_ENTER(TRC_SSL, "SSLCallback::callback()");     PEG_METHOD_ENTER(TRC_SSL, "SSLCallback::callback()");
  
Line 202 
Line 315 
     X509   *currentCert;     X509   *currentCert;
     SSL    *ssl;     SSL    *ssl;
     int    verifyError = X509_V_OK;     int    verifyError = X509_V_OK;
       int    revoked = -1;
   
       Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                     "--->SSL: Preverify Error %d", verifyError);
  
     //     //
     // get the verification callback info specific to each SSL connection     // get the verification callback info specific to each SSL connection
Line 209 
Line 326 
     ssl = (SSL*) X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());     ssl = (SSL*) X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
     SSLCallbackInfo* exData = (SSLCallbackInfo*) SSL_get_ex_data(ssl, SSLCallbackInfo::SSL_CALLBACK_INDEX);     SSLCallbackInfo* exData = (SSLCallbackInfo*) SSL_get_ex_data(ssl, SSLCallbackInfo::SSL_CALLBACK_INDEX);
  
   
   #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
     //     //
     // If the SSLContext does not have an additional callback      // Check to see if a CRL path is defined
     // simply return the preverification error.  
     // We do not need to go through the additional steps.  
     //     //
     if (exData->verifyCertificateCallback == NULL)      if (exData->_rep->crlStore != NULL)
       {
           revoked = verificationCRLCallback(preVerifyOk,ctx,exData->_rep->crlStore);
           Tracer::trace(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL callback returned %d", revoked);
   
           if (revoked) //with the SSL callbacks '0' indicates failure
     {     {
         return (preVerifyOk);              PEG_METHOD_EXIT();
               return 0;
     }     }
       }
   
       Tracer::trace(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL callback returned %d", revoked);
   #endif
  
     //     //
     // get the current certificate     // get the current certificate
Line 267 
Line 394 
     //     //
     if (!preVerifyOk)     if (!preVerifyOk)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,          Tracer::trace(TRC_SSL, Tracer::LEVEL4,
             "---> SSL: certificate default verification error: " + errorStr);                        "---> SSL: certificate default verification error: %s", (const char*)errorStr.getCString());
     }     }
  
     //     //
     // get the issuer name on the certificate     // get the issuer name on the certificate
     //     //
     if (!preVerifyOk && (errorCode == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT))  
     {  
         X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);  
     }  
     else  
     {  
         X509_NAME_oneline(X509_get_issuer_name(currentCert), buf, 256);         X509_NAME_oneline(X509_get_issuer_name(currentCert), buf, 256);
     }  
     String issuerName = String(buf);     String issuerName = String(buf);
  
 //    SSLCertificateInfo certInfo(subjectName, issuerName, version, serialNumber,      //
 //        notBefore, notAfter, depth, errorCode, errorStr, preVerifyOk);      // Create the certificate object
       //
   
       //insert at the beginning of the array so that the peer certificate is first and the root CA is last
       exData->_rep->peerCertificate.insert(0, new SSLCertificateInfo(subjectName, issuerName, version, serialNumber,
           notBefore, notAfter, depth, errorCode, errorStr, preVerifyOk));
  
     exData->_peerCertificate = new SSLCertificateInfo(subjectName, issuerName, version, serialNumber,      PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "Created SSLCertificateInfo");
         notBefore, notAfter, depth, errorCode, errorStr, preVerifyOk);  
       // NOT_YET_VALID checks do not work correctly on subsequent tries -- Bugzilla#4283
       // call this prior to calling the user-specified callback in case they want to override it
       if (errorCode == X509_V_OK && (CIMDateTime::getDifference(CIMDateTime::getCurrentDateTime(), notBefore) > 0))
       {
           PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "Certificate was not yet valid.");
           X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_NOT_YET_VALID);
       }
  
     //     //
     // Call the application callback.      // Call the user-specified application callback if it is specified.  If it is null, return OpenSSL's verification code.
     // Note that the verification result does not automatically get set to X509_V_OK if the callback is successful.     // Note that the verification result does not automatically get set to X509_V_OK if the callback is successful.
     // This is because OpenSSL retains the original default error in case we want to use it later.     // This is because OpenSSL retains the original default error in case we want to use it later.
     // To set the error, we could use X509_STORE_CTX_set_error(ctx, verifyError); but there is no real benefit to doing that here.     // To set the error, we could use X509_STORE_CTX_set_error(ctx, verifyError); but there is no real benefit to doing that here.
     //     //
     if (exData->verifyCertificateCallback(*exData->_peerCertificate))//certInfo))      if (exData->_rep->verifyCertificateCallback == NULL)
       {
           return preVerifyOk;
   
       } else
       {
           if (exData->_rep->verifyCertificateCallback(*exData->_rep->peerCertificate[0]))
     {     {
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,         Tracer::trace(TRC_SSL, Tracer::LEVEL4,
             "--> SSL: verifyCertificateCallback() returned X509_V_OK");                  "--> SSL: _rep->verifyCertificateCallback() returned X509_V_OK");
  
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return 1;         return 1;
Line 307 
Line 445 
     else // verification failed, handshake will be immediately terminated     else // verification failed, handshake will be immediately terminated
     {     {
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,         Tracer::trace(TRC_SSL, Tracer::LEVEL4,
             "--> SSL: verifyCertificateCallback() returned error %d", exData->_peerCertificate->getErrorCode());                  "--> SSL: _rep->verifyCertificateCallback() returned error %d", exData->_rep->peerCertificate[0]->getErrorCode());
  
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return 0;         return 0;
     }     }
 } }
   }
  
 // //
 // Callback function called by OpenSSL.  This request is merely forwarded to the static // Callback function called by OpenSSL.  This request is merely forwarded to the static
Line 321 
Line 460 
 // //
 extern "C" int prepareForCallback(int preVerifyOk, X509_STORE_CTX *ctx) extern "C" int prepareForCallback(int preVerifyOk, X509_STORE_CTX *ctx)
 { {
     return SSLCallback::callback(preVerifyOk, ctx);      return SSLCallback::verificationCallback(preVerifyOk, ctx);
 } }
  
 // //
Line 337 
Line 476 
     if ( mode & CRYPTO_LOCK )     if ( mode & CRYPTO_LOCK )
     {     {
         /*Tracer::trace(TRC_SSL, Tracer::LEVEL4,         /*Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                 "Now locking for %d", pegasus_thread_self());*/                  "Now locking for %d", Threads::id());*/
         SSLContextRep::_sslLocks[type].lock( pegasus_thread_self() );          SSLContextRep::_sslLocks.get()[type].lock( );
     }     }
     else     else
     {     {
         /*Tracer::trace(TRC_SSL, Tracer::LEVEL4,         /*Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                 "Now unlocking for %d", pegasus_thread_self());*/                  "Now unlocking for %d", Threads::id());*/
         SSLContextRep::_sslLocks[type].unlock( );          SSLContextRep::_sslLocks.get()[type].unlock( );
     }     }
 } }
  
   static unsigned long _get_thread_id()
   {
   #if defined(PEGASUS_HAVE_PTHREADS)
       return pthread_self();
   #else
       return 0;
   #endif
   }
   
 // //
 // Initialize OpenSSL Locking and id callbacks. // Initialize OpenSSL Locking and id callbacks.
 // //
Line 358 
Line 506 
      PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,      PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,
            "Initialized SSL callback.");            "Initialized SSL callback.");
  
      _sslLocks= new Mutex[CRYPTO_num_locks()];  #ifdef PEGASUS_OS_OS400
        // Load the OpenSSL library and get the exports
        SSL_OS400_Init();
   #endif
   
        _sslLocks.reset(new Mutex[CRYPTO_num_locks()]);
  
      // Set the ID callback. The ID callback returns a thread ID.      // Set the ID callback. The ID callback returns a thread ID.
  
      CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK) pegasus_thread_self);       CRYPTO_set_id_callback((CRYPTO_SET_ID_CALLBACK)_get_thread_id);
  
      // Set the locking callback to pegasus_locking_callback.      // Set the locking callback to pegasus_locking_callback.
  
Line 379 
Line 532 
     CRYPTO_set_id_callback     (NULL);     CRYPTO_set_id_callback     (NULL);
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,
              "Freed SSL callback.");              "Freed SSL callback.");
       _sslLocks.reset();
     delete []_sslLocks;  
 } }
  
  
Line 394 
Line 546 
                        const String& trustStore,                        const String& trustStore,
                        const String& certPath,                        const String& certPath,
                        const String& keyPath,                        const String& keyPath,
                          const String& crlPath,
                        SSLCertificateVerifyFunction* verifyCert,                        SSLCertificateVerifyFunction* verifyCert,
                        Boolean trustStoreAutoUpdate,  
                                            String trustStoreUserName,  
                        const String& randomFile)                        const String& randomFile)
 { {
     PEG_METHOD_ENTER(TRC_SSL, "SSLContextRep::SSLContextRep()");     PEG_METHOD_ENTER(TRC_SSL, "SSLContextRep::SSLContextRep()");
Line 407 
Line 558 
  
     _keyPath = keyPath;     _keyPath = keyPath;
  
     _certificateVerifyFunction = verifyCert;      _crlPath = crlPath;
  
     _trustStoreAutoUpdate = trustStoreAutoUpdate;      _crlStore = NULL;
  
         _trustStoreUserName = trustStoreUserName;      _certificateVerifyFunction = verifyCert;
  
     //     //
     // If a truststore and/or peer verification function is specified, enable peer verification     // If a truststore and/or peer verification function is specified, enable peer verification
Line 441 
Line 592 
             // load SSL library             // load SSL library
             //             //
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,             Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                 "Before calling SSL_load_error_strings %d", pegasus_thread_self());                  "Before calling SSL_load_error_strings %d", Threads::id());
  
             SSL_load_error_strings();             SSL_load_error_strings();
  
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,             Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                 "After calling SSL_load_error_strings %d", pegasus_thread_self());                  "After calling SSL_load_error_strings %d", Threads::id());
  
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,             Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                 "Before calling SSL_library_init %d", pegasus_thread_self());                  "Before calling SSL_library_init %d", Threads::id());
  
             SSL_library_init();             SSL_library_init();
  
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,             Tracer::trace(TRC_SSL, Tracer::LEVEL4,
                 "After calling SSL_library_init %d", pegasus_thread_self());                  "After calling SSL_library_init %d", Threads::id());
   
         }         }
   
     _countRep++;     _countRep++;
     }  // mutex unlocks here     }  // mutex unlocks here
  
Line 474 
Line 625 
     _trustStore = sslContextRep._trustStore;     _trustStore = sslContextRep._trustStore;
     _certPath = sslContextRep._certPath;     _certPath = sslContextRep._certPath;
     _keyPath = sslContextRep._keyPath;     _keyPath = sslContextRep._keyPath;
       _crlPath = sslContextRep._crlPath;
       _crlStore = sslContextRep._crlStore;
     _verifyPeer = sslContextRep._verifyPeer;     _verifyPeer = sslContextRep._verifyPeer;
     _trustStoreAutoUpdate = sslContextRep._trustStoreAutoUpdate;  
         _trustStoreUserName = sslContextRep._trustStoreUserName;  
     _certificateVerifyFunction = sslContextRep._certificateVerifyFunction;     _certificateVerifyFunction = sslContextRep._certificateVerifyFunction;
     _randomFile = sslContextRep._randomFile;     _randomFile = sslContextRep._randomFile;
  
Line 489 
Line 640 
         {         {
             init_ssl();             init_ssl();
         }         }
   
     _countRep++;     _countRep++;
     }  // mutex unlocks here     }  // mutex unlocks here
  
Line 591 
Line 743 
             // Try to do more seeding             // Try to do more seeding
             //             //
             long seedNumber;             long seedNumber;
         #if defined(PEGASUS_PLATFORM_WIN32_IX86_MSVC)          #if defined(PEGASUS_COMPILER_MSVC)
             srand((unsigned int)time(NULL)); // Initialize             srand((unsigned int)time(NULL)); // Initialize
             seedNumber = rand();             seedNumber = rand();
         #else         #else
Line 671 
Line 823 
  
     SSL_CTX_set_quiet_shutdown(sslContext, 1);     SSL_CTX_set_quiet_shutdown(sslContext, 1);
     SSL_CTX_set_mode(sslContext, SSL_MODE_AUTO_RETRY);     SSL_CTX_set_mode(sslContext, SSL_MODE_AUTO_RETRY);
     SSL_CTX_set_options(sslContext,SSL_OP_ALL);      SSL_CTX_set_mode(sslContext, SSL_MODE_ENABLE_PARTIAL_WRITE);
     SSL_CTX_set_session_cache_mode(sslContext, SSL_SESS_CACHE_OFF);     SSL_CTX_set_session_cache_mode(sslContext, SSL_SESS_CACHE_OFF);
  
       int options = SSL_OP_ALL;
   #ifndef PEGASUS_ENABLE_SSLV2 //SSLv2 is disabled by default
       options |= SSL_OP_NO_SSLv2;
   #endif
       SSL_CTX_set_options(sslContext, options);
   
     if (_verifyPeer)     if (_verifyPeer)
     {     {
         //ATTN: We might still need a flag to specify SSL_VERIFY_FAIL_IF_NO_PEER_CERT         //ATTN: We might still need a flag to specify SSL_VERIFY_FAIL_IF_NO_PEER_CERT
Line 784 
Line 942 
         }         }
     }     }
  
       if (_crlPath != String::EMPTY)
       {
           //need to save this -- can we make it static since there's only one CRL for cimserver?
           X509_LOOKUP* pLookup;
   
           _crlStore = X509_STORE_new();
   
           //the validity of the crlstore was checked in ConfigManager during server startup
           if (FileSystem::isDirectory(_crlPath))
           {
               Tracer::trace(TRC_SSL, Tracer::LEVEL3,
                             "---> SSL: CRL store is a directory in %s", (const char*)_crlPath.getCString());
   
               if ((pLookup = X509_STORE_add_lookup(_crlStore, X509_LOOKUP_hash_dir())) == NULL)
               {
                   MessageLoaderParms parms("Common.SSLContext.COULD_NOT_LOAD_CRLS",
                                            "Could not load certificate revocation list.");
                   X509_STORE_free(_crlStore);
                   PEG_METHOD_EXIT();
                   throw SSLException(parms);
               }
   
               X509_LOOKUP_add_dir(pLookup, (const char*)_crlPath.getCString(), X509_FILETYPE_PEM);
   
               PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
                               "---> SSL: Successfully configured CRL directory");
   
           } else
           {
               Tracer::trace(TRC_SSL, Tracer::LEVEL3,
                             "---> SSL: CRL store is the file %s", (const char*)_crlPath.getCString());
   
               if ((pLookup = X509_STORE_add_lookup(_crlStore, X509_LOOKUP_file())) == NULL)
               {
                   MessageLoaderParms parms("Common.SSLContext.COULD_NOT_LOAD_CRLS",
                                            "Could not load certificate revocation list.");
                   X509_STORE_free(_crlStore);
                   PEG_METHOD_EXIT();
                   throw SSLException(parms);
               }
   
               X509_LOOKUP_load_file(pLookup, (const char*)_crlPath.getCString(), X509_FILETYPE_PEM);
   
               PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
                               "---> SSL: Successfully configured CRL file");
           }
       }
   
     Boolean keyLoaded = false;     Boolean keyLoaded = false;
  
     //     //
Line 904 
Line 1110 
     return _keyPath;     return _keyPath;
 } }
  
 Boolean SSLContextRep::isPeerVerificationEnabled() const  #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
   String SSLContextRep::getTrustStoreUserName() const
 { {
     return _verifyPeer;      return String::EMPTY;
   }
   #endif
   
   String SSLContextRep::getCRLPath() const
   {
       return _crlPath;
 } }
  
 Boolean SSLContextRep::isTrustStoreAutoUpdateEnabled() const  X509_STORE* SSLContextRep::getCRLStore() const
 { {
     return _trustStoreAutoUpdate;      return _crlStore;
 } }
  
 String SSLContextRep::getTrustStoreUserName() const  void SSLContextRep::setCRLStore(X509_STORE* store)
   {
       _crlStore = store;
   }
   
   Boolean SSLContextRep::isPeerVerificationEnabled() const
 { {
         return _trustStoreUserName;      return _verifyPeer;
 } }
  
 SSLCertificateVerifyFunction* SSLContextRep::getSSLCertificateVerifyFunction() const SSLCertificateVerifyFunction* SSLContextRep::getSSLCertificateVerifyFunction() const
Line 933 
Line 1151 
 SSLContextRep::SSLContextRep(const String& trustStore, SSLContextRep::SSLContextRep(const String& trustStore,
                        const String& certPath,                        const String& certPath,
                        const String& keyPath,                        const String& keyPath,
                          const String& crlPath,
                        SSLCertificateVerifyFunction* verifyCert,                        SSLCertificateVerifyFunction* verifyCert,
                        Boolean trustStoreAutoUpdate,                         const String& randomFile)
                                            String trustStoreUserName,  {}
                        const String& randomFile) {}  
  
 SSLContextRep::SSLContextRep(const SSLContextRep& sslContextRep) {} SSLContextRep::SSLContextRep(const SSLContextRep& sslContextRep) {}
  
Line 955 
Line 1173 
  
 String SSLContextRep::getKeyPath() const { return String::EMPTY; } String SSLContextRep::getKeyPath() const { return String::EMPTY; }
  
 Boolean SSLContextRep::isPeerVerificationEnabled() const { return false; }  #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
   String SSLContextRep::getTrustStoreUserName() const { return String::EMPTY; }
   #endif
  
 Boolean SSLContextRep::isTrustStoreAutoUpdateEnabled() const { return false; }  String SSLContextRep::getCRLPath() const { return String::EMPTY; }
  
 String SSLContextRep::getTrustStoreUserName() const { return String::EMPTY; }  X509_STORE* SSLContextRep::getCRLStore() const { return NULL; }
   
   void SSLContextRep::setCRLStore(X509_STORE* store) { }
   
   Boolean SSLContextRep::isPeerVerificationEnabled() const { return false; }
  
 SSLCertificateVerifyFunction* SSLContextRep::getSSLCertificateVerifyFunction() const { return NULL; } SSLCertificateVerifyFunction* SSLContextRep::getSSLCertificateVerifyFunction() const { return NULL; }
  
Line 981 
Line 1205 
     SSLCertificateVerifyFunction* verifyCert,     SSLCertificateVerifyFunction* verifyCert,
     const String& randomFile)     const String& randomFile)
 { {
     _rep = new SSLContextRep(trustStore, String::EMPTY, String::EMPTY,  verifyCert, false, String::EMPTY, randomFile);      _rep = new SSLContextRep(trustStore, String::EMPTY, String::EMPTY, String::EMPTY, verifyCert, randomFile);
 } }
  
 SSLContext::SSLContext( SSLContext::SSLContext(
Line 991 
Line 1215 
     SSLCertificateVerifyFunction* verifyCert,     SSLCertificateVerifyFunction* verifyCert,
     const String& randomFile)     const String& randomFile)
 { {
     _rep = new SSLContextRep(trustStore, certPath, keyPath, verifyCert, false, String::EMPTY, randomFile);      _rep = new SSLContextRep(trustStore, certPath, keyPath, String::EMPTY, verifyCert, randomFile);
 } }
  
   //PEP187
 SSLContext::SSLContext( SSLContext::SSLContext(
         const String& trustStore,         const String& trustStore,
         const String& certPath,         const String& certPath,
         const String& keyPath,         const String& keyPath,
           const String& crlPath,
         SSLCertificateVerifyFunction* verifyCert,         SSLCertificateVerifyFunction* verifyCert,
                 String trustStoreUserName,  
         const String& randomFile)         const String& randomFile)
 { {
     _rep = new SSLContextRep(trustStore, certPath, keyPath, verifyCert, false, trustStoreUserName, randomFile);  #ifndef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
       if ( crlPath.size() > 0 )
       {
           MessageLoaderParms parms("Common.Exception.SSL_CRL_NOT_ENABLED_EXCEPTION",
                                    "SSL CRL verification is not enabled.");
           throw Exception(parms);
       }
   #endif
       _rep = new SSLContextRep(trustStore, certPath, keyPath, crlPath, verifyCert, randomFile);
 } }
  
 #ifdef PEGASUS_USE_AUTOMATIC_TRUSTSTORE_UPDATE  #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
 SSLContext::SSLContext( SSLContext::SSLContext(
         const String& trustStore,         const String& trustStore,
         const String& certPath,         const String& certPath,
         const String& keyPath,         const String& keyPath,
         SSLCertificateVerifyFunction* verifyCert,         SSLCertificateVerifyFunction* verifyCert,
         Boolean trustStoreAutoUpdate,  
                 String trustStoreUserName,                 String trustStoreUserName,
         const String& randomFile)         const String& randomFile)
 { {
     _rep = new SSLContextRep(trustStore, certPath, keyPath, verifyCert, trustStoreAutoUpdate, trustStoreUserName, randomFile);      _rep = new SSLContextRep(trustStore, certPath, keyPath, String::EMPTY, verifyCert, randomFile);
 } }
 #endif #endif
  
   
 SSLContext::SSLContext(const SSLContext& sslContext) SSLContext::SSLContext(const SSLContext& sslContext)
 { {
     _rep = new SSLContextRep(*sslContext._rep);     _rep = new SSLContextRep(*sslContext._rep);
Line 1050 
Line 1281 
     return (_rep->getKeyPath());     return (_rep->getKeyPath());
 } }
  
 Boolean SSLContext::isPeerVerificationEnabled() const  String SSLContext::getCRLPath() const
 { {
     return (_rep->isPeerVerificationEnabled());  #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
       return (_rep->getCRLPath());
   #else
       MessageLoaderParms parms("Common.Exception.SSL_CRL_NOT_ENABLED_EXCEPTION",
                                "SSL CRL verification is not enabled.");
       throw Exception(parms);
   #endif
 } }
  
 #ifdef PEGASUS_USE_AUTOMATIC_TRUSTSTORE_UPDATE  X509_STORE* SSLContext::getCRLStore() const
 Boolean SSLContext::isTrustStoreAutoUpdateEnabled() const  
 { {
     return (_rep->isTrustStoreAutoUpdateEnabled());  #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
 }      return (_rep->getCRLStore());
   #else
       MessageLoaderParms parms("Common.Exception.SSL_CRL_NOT_ENABLED_EXCEPTION",
                                "SSL CRL verification is not enabled.");
       throw Exception(parms);
 #endif #endif
   }
   
   Boolean SSLContext::isPeerVerificationEnabled() const
   {
       return (_rep->isPeerVerificationEnabled());
   }
  
   #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
 String SSLContext::getTrustStoreUserName() const String SSLContext::getTrustStoreUserName() const
 { {
         return (_rep->getTrustStoreUserName());         return (_rep->getTrustStoreUserName());
 } }
   #endif
  
 SSLCertificateVerifyFunction* SSLContext::getSSLCertificateVerifyFunction() const SSLCertificateVerifyFunction* SSLContext::getSSLCertificateVerifyFunction() const
 { {
Line 1293 
Line 1541 
     sprintf(buf, "Version number: %d\n", _rep->versionNumber);     sprintf(buf, "Version number: %d\n", _rep->versionNumber);
     s.append(buf);     s.append(buf);
  
     sprintf(buf, "Serial number: %ld\n", _rep->serialNumber);      sprintf(buf, "Serial number: %lu\n", _rep->serialNumber);
     s.append(buf);     s.append(buf);
  
     s.append("Not before date: ");     s.append("Not before date: ");
Line 1307 
Line 1555 
     return s;     return s;
 } }
  
   ///////////////////////////////////////////////////////////////////////////////
   //
   // SSLCallbackInfo
   //
   ///////////////////////////////////////////////////////////////////////////////
   
 SSLCallbackInfo::SSLCallbackInfo(SSLCertificateVerifyFunction* verifyCert) SSLCallbackInfo::SSLCallbackInfo(SSLCertificateVerifyFunction* verifyCert)
 { {
     verifyCertificateCallback = verifyCert;      _rep = new SSLCallbackInfoRep();
     _peerCertificate = NULL;      _rep->verifyCertificateCallback = verifyCert;
       _rep->crlStore = NULL;
   }
   
   SSLCallbackInfo::SSLCallbackInfo(SSLCertificateVerifyFunction* verifyCert, X509_STORE* crlStore)
   {
       _rep = new SSLCallbackInfoRep();
       _rep->verifyCertificateCallback = verifyCert;
       _rep->crlStore = crlStore;
 } }
  
 SSLCallbackInfo::~SSLCallbackInfo() SSLCallbackInfo::~SSLCallbackInfo()
 { {
     if (_peerCertificate)      PEG_METHOD_ENTER(TRC_SSL, "SSLCallbackInfo::~SSLCallbackInfo");
       for (Uint32 i = 0; i < _rep->peerCertificate.size(); i++)
     {     {
         delete _peerCertificate;          delete _rep->peerCertificate[i];
     }     }
       delete _rep;
       PEG_METHOD_EXIT();
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.39  
changed lines
  Added in v.1.72

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2