(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.76.2.5 and 1.96.4.1

version 1.76.2.5, 2007/01/11 01:34:35 version 1.96.4.1, 2008/07/01 15:18:01
Line 32 
Line 32 
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #ifdef PEGASUS_HAS_SSL #ifdef PEGASUS_HAS_SSL
   
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/Executor.h> #include <Pegasus/Common/Executor.h>
   # include <Pegasus/Common/Network.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 45 
Line 42 
 #else #else
 #define SSL_CTX void #define SSL_CTX void
 #endif // end of PEGASUS_HAS_SSL #endif // end of PEGASUS_HAS_SSL
   
   #include <time.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 <Pegasus/Common/MessageLoader.h> #include <Pegasus/Common/MessageLoader.h>
 #include <Pegasus/Common/Formatter.h>  
  
 #include "SSLContext.h" #include "SSLContext.h"
 #include "SSLContextRep.h" #include "SSLContextRep.h"
  
 #ifdef PEGASUS_OS_OS400  #ifdef PEGASUS_OS_PASE
 #include "SSLWrapperOS400.h"  # include <ILEWrapper/ILEUtilities.h>
 #endif #endif
  
 //  
 // 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);  
 };  
   
 typedef struct x509_store_ctx_st X509_STORE_CTX; typedef struct x509_store_ctx_st X509_STORE_CTX;
  
 typedef struct Timestamp typedef struct Timestamp
Line 96 
Line 84 
 // //
 #ifdef PEGASUS_HAS_SSL #ifdef PEGASUS_HAS_SSL
  
 // Mutex for SSL locks which will get initialized by AutoArrayPtr constructor.  AutoArrayPtr<Mutex> SSLEnvironmentInitializer::_sslLocks;
 AutoArrayPtr<Mutex> SSLContextRep::_sslLocks;  int SSLEnvironmentInitializer::_instanceCount = 0;
   Mutex SSLEnvironmentInitializer::_instanceCountMutex;
 // Mutex for _countRep.  
 Mutex SSLContextRep::_countRepMutex;  
   
 // Initialise _count for SSLContextRep objects.  
 int SSLContextRep::_countRep = 0;  
  
  
 // //
Line 219 
Line 202 
     //check whether a CRL store was specified     //check whether a CRL store was specified
     if (sslCRLStore == NULL)     if (sslCRLStore == NULL)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,          PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
             "---> SSL: CRL store is NULL");             "---> SSL: CRL store is NULL");
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return 0;         return 0;
Line 239 
Line 222 
     //log certificate information     //log certificate information
     //this is information in the "public" key, so it does no harm to log it     //this is information in the "public" key, so it does no harm to log it
     X509_NAME_oneline(issuerName, buf, sizeof(buf));     X509_NAME_oneline(issuerName, buf, sizeof(buf));
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,      PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
         "---> SSL: Certificate Data: Issuer/Subject");         "---> SSL: Certificate Data: Issuer/Subject");
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, buf);      PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4, buf);
     X509_NAME_oneline(subjectName, buf, sizeof(buf));     X509_NAME_oneline(subjectName, buf, sizeof(buf));
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, buf);      PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4, buf);
  
     //initialize the CRL store     //initialize the CRL store
     X509_STORE_CTX crlStoreCtx;     X509_STORE_CTX crlStoreCtx;
     X509_STORE_CTX_init(&crlStoreCtx, sslCRLStore, NULL, NULL);     X509_STORE_CTX_init(&crlStoreCtx, sslCRLStore, NULL, NULL);
  
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,      PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
         "---> SSL: Initialized CRL store");         "---> SSL: Initialized CRL store");
  
     //attempt to get a CRL issued by the certificate's issuer     //attempt to get a CRL issued by the certificate's issuer
Line 257 
Line 240 
     if (X509_STORE_get_by_subject(     if (X509_STORE_get_by_subject(
             &crlStoreCtx, X509_LU_CRL, issuerName, &obj) <= 0)             &crlStoreCtx, X509_LU_CRL, issuerName, &obj) <= 0)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,          X509_STORE_CTX_cleanup(&crlStoreCtx);
           PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
             "---> SSL: No CRL by that issuer");             "---> SSL: No CRL by that issuer");
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return 0;         return 0;
Line 268 
Line 252 
     X509_CRL* crl = obj.data.crl;     X509_CRL* crl = obj.data.crl;
     if (crl == NULL)     if (crl == NULL)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL is null");          PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL is null");
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return 0;         return 0;
     }     }
     else     else
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,          PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
             "---> SSL: Found CRL by that issuer");             "---> SSL: Found CRL by that issuer");
     }     }
  
Line 282 
Line 266 
     STACK_OF(X509_REVOKED)* revokedCerts = NULL;     STACK_OF(X509_REVOKED)* revokedCerts = NULL;
     revokedCerts = X509_CRL_get_REVOKED(crl);     revokedCerts = X509_CRL_get_REVOKED(crl);
     int numRevoked = sk_X509_REVOKED_num(revokedCerts);     int numRevoked = sk_X509_REVOKED_num(revokedCerts);
     Tracer::trace(TRC_SSL, Tracer::LEVEL4,      PEG_TRACE((TRC_SSL, Tracer::LEVEL4,
         "---> SSL: Number of certificates revoked by the issuer %d\n",         "---> SSL: Number of certificates revoked by the issuer %d\n",
         numRevoked);          numRevoked));
  
     //check whether the subject's certificate is revoked     //check whether the subject's certificate is revoked
     X509_REVOKED* revokedCert = NULL;     X509_REVOKED* revokedCert = NULL;
Line 295 
Line 279 
         //a matching serial number indicates revocation         //a matching serial number indicates revocation
         if (ASN1_INTEGER_cmp(revokedCert->serialNumber, serialNumber) == 0)         if (ASN1_INTEGER_cmp(revokedCert->serialNumber, serialNumber) == 0)
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL2,
                 "---> SSL: Certificate is revoked");                 "---> SSL: Certificate is revoked");
             X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REVOKED);             X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REVOKED);
               X509_CRL_free(crl);
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             return 1;             return 1;
         }         }
     }     }
  
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,      X509_CRL_free(crl);
   
       PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
         "---> SSL: Certificate is not revoked at this level");         "---> SSL: Certificate is not revoked at this level");
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 320 
Line 307 
 int SSLCallback::verificationCallback(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()");
   
     char   buf[256];     char   buf[256];
     X509   *currentCert;     X509   *currentCert;
     SSL    *ssl;     SSL    *ssl;
     int    verifyError = X509_V_OK;  
     int    revoked = -1;     int    revoked = -1;
  
     Tracer::trace(TRC_SSL, Tracer::LEVEL4,      PEG_TRACE((TRC_SSL, Tracer::LEVEL4,
         "--->SSL: Preverify Error %d", verifyError);          "--->SSL: Preverify result %d", preVerifyOk));
  
     //     //
     // get the verification callback info specific to each SSL connection     // get the verification callback info specific to each SSL connection
Line 346 
Line 331 
     {     {
         revoked = verificationCRLCallback(         revoked = verificationCRLCallback(
             preVerifyOk,ctx,exData->_rep->crlStore);             preVerifyOk,ctx,exData->_rep->crlStore);
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,          PEG_TRACE((TRC_SSL, Tracer::LEVEL4,
             "---> SSL: CRL callback returned %d", revoked);              "---> SSL: CRL callback returned %d", revoked));
  
         if (revoked) //with the SSL callbacks '0' indicates failure         if (revoked) //with the SSL callbacks '0' indicates failure
         {         {
Line 356 
Line 341 
         }         }
     }     }
  
     Tracer::trace(TRC_SSL, Tracer::LEVEL4,      PEG_TRACE((TRC_SSL, Tracer::LEVEL4,
         "---> SSL: CRL callback returned %d", revoked);          "---> SSL: CRL callback returned %d", revoked));
 #endif #endif
  
     //     //
Line 408 
Line 393 
     //     //
     if (!preVerifyOk)     if (!preVerifyOk)
     {     {
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,          PEG_TRACE((TRC_SSL, Tracer::LEVEL2,
             "---> SSL: certificate default verification error: %s",             "---> SSL: certificate default verification error: %s",
             (const char*)errorStr.getCString());              (const char*)errorStr.getCString()));
     }     }
  
     //     //
Line 429 
Line 414 
         subjectName, issuerName, version, serialNumber,         subjectName, issuerName, version, serialNumber,
         notBefore, notAfter, depth, errorCode, errorStr, preVerifyOk));         notBefore, notAfter, depth, errorCode, errorStr, preVerifyOk));
  
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "Created SSLCertificateInfo");      PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3, "Created SSLCertificateInfo");
  
     // NOT_YET_VALID checks do not work correctly on subsequent tries --     // NOT_YET_VALID checks do not work correctly on subsequent tries --
     // Bugzilla#4283     // Bugzilla#4283
Line 439 
Line 424 
         (CIMDateTime::getDifference(         (CIMDateTime::getDifference(
              CIMDateTime::getCurrentDateTime(), notBefore) > 0))              CIMDateTime::getCurrentDateTime(), notBefore) > 0))
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,          PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL2,
             "Certificate was not yet valid.");             "Certificate was not yet valid.");
   
         X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_NOT_YET_VALID);         X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_NOT_YET_VALID);
     }     }
  
Line 452 
Line 438 
     // This is because OpenSSL retains the original default error in case     // This is because OpenSSL retains the original default error in case
     // we want to use it later.     // we want to use it later.
     // To set the error, we could use X509_STORE_CTX_set_error(ctx,     // To set the error, we could use X509_STORE_CTX_set_error(ctx,
     // verifyError); but there is no real benefit to doing that here.      // X509_V_OK); but there is no real benefit to doing that here.
     //     //
     if (exData->_rep->verifyCertificateCallback == NULL)     if (exData->_rep->verifyCertificateCallback == NULL)
     {     {
           PEG_METHOD_EXIT();
         return preVerifyOk;         return preVerifyOk;
   
     }     }
     else     else
     {     {
         if (exData->_rep->verifyCertificateCallback(         if (exData->_rep->verifyCertificateCallback(
                 *exData->_rep->peerCertificate[0]))                 *exData->_rep->peerCertificate[0]))
         {         {
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
                 "--> SSL: _rep->verifyCertificateCallback() returned "                 "--> SSL: _rep->verifyCertificateCallback() returned "
                     "X509_V_OK");                     "X509_V_OK");
   
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             return 1;             return 1;
         }         }
         else // verification failed, handshake will be immediately terminated         else // verification failed, handshake will be immediately terminated
         {         {
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,              PEG_TRACE((TRC_SSL, Tracer::LEVEL1,
                 "--> SSL: _rep->verifyCertificateCallback() returned error %d",                 "--> SSL: _rep->verifyCertificateCallback() returned error %d",
                 exData->_rep->peerCertificate[0]->getErrorCode());                  exData->_rep->peerCertificate[0]->getErrorCode()));
  
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             return 0;             return 0;
Line 495 
Line 480 
 } }
  
 // //
 // Implement OpenSSL locking callback.  
 //  
 void pegasus_locking_callback(  
     int mode,  
     int type,  
     const char* file,  
     int line)  
 {  
     // Check whether the mode is lock or unlock.  
   
     if ( mode & CRYPTO_LOCK )  
     {  
         /*Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "Now locking for %d", Threads::id());*/  
         SSLContextRep::_sslLocks.get()[type].lock( );  
     }  
     else  
     {  
         /*Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "Now unlocking for %d", Threads::id());*/  
         SSLContextRep::_sslLocks.get()[type].unlock( );  
     }  
 }  
   
 //  
 // Initialize OpenSSL Locking and id callbacks.  
 //  
 void SSLContextRep::init_ssl()  
 {  
      // Allocate Memory for _sslLocks. SSL locks needs to be able to handle  
      // up to CRYPTO_num_locks() different mutex locks.  
      PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,  
            "Initialized SSL callback.");  
   
 #ifdef PEGASUS_OS_OS400  
      // Load the OpenSSL library and get the exports  
      SSL_OS400_Init();  
 #endif  
   
      _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 to pegasus_locking_callback.  
   
      CRYPTO_set_locking_callback(  
          (CRYPTO_SET_LOCKING_CALLBACK) pegasus_locking_callback);  
   
 }  
   
 // Free OpenSSL Locking and id callbacks.  
 void SSLContextRep::free_ssl()  
 {  
     // Cleanup _sslLocks and set locking & id callback to NULL.  
   
     CRYPTO_set_locking_callback(NULL);  
     CRYPTO_set_id_callback     (NULL);  
     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,  
              "Freed SSL callback.");  
     _sslLocks.reset();  
 }  
   
   
 //  
 // SSL context area // SSL context area
 // //
 // For the OSs that don't have /dev/random device file, // For the OSs that don't have /dev/random device file,
Line 578 
Line 496 
     PEG_METHOD_ENTER(TRC_SSL, "SSLContextRep::SSLContextRep()");     PEG_METHOD_ENTER(TRC_SSL, "SSLContextRep::SSLContextRep()");
  
     _trustStore = trustStore;     _trustStore = trustStore;
   
     _certPath = certPath;     _certPath = certPath;
   
     _keyPath = keyPath;     _keyPath = keyPath;
   
     _crlPath = crlPath;     _crlPath = crlPath;
   
     _crlStore = NULL;  
   
     _certificateVerifyFunction = verifyCert;     _certificateVerifyFunction = verifyCert;
  
     //     //
     // If a truststore and/or peer verification function is specified,     // If a truststore and/or peer verification function is specified,
     // enable peer verification     // enable peer verification
     //     //
     if (trustStore != String::EMPTY || verifyCert != NULL)      _verifyPeer = (trustStore != String::EMPTY || verifyCert != NULL);
     {  
         _verifyPeer = true;  
     }  
     else  
     {  
         _verifyPeer = false;  
     }  
   
     //  
     // Initialize SSL callbacks and increment the SSLContextRep object _counter.  
     //  
     {  
        AutoMutex autoMut(_countRepMutex);  
   
        Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "Value of Countrep in constructor %d", _countRep);  
         if ( _countRep == 0 )  
         {  
             init_ssl();  
   
             //  
             // load SSL library  
             //  
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "Before calling SSL_load_error_strings %d", Threads::id());  
   
             SSL_load_error_strings();  
   
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "After calling SSL_load_error_strings %d", Threads::id());  
   
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "Before calling SSL_library_init %d", Threads::id());  
   
             SSL_library_init();  
   
             Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                 "After calling SSL_library_init %d", Threads::id());  
         }  
   
         _countRep++;  
     }  // mutex unlocks here  
  
     _randomInit(randomFile);     _randomInit(randomFile);
  
Line 652 
Line 522 
     _certPath = sslContextRep._certPath;     _certPath = sslContextRep._certPath;
     _keyPath = sslContextRep._keyPath;     _keyPath = sslContextRep._keyPath;
     _crlPath = sslContextRep._crlPath;     _crlPath = sslContextRep._crlPath;
     _crlStore = sslContextRep._crlStore;  
     _verifyPeer = sslContextRep._verifyPeer;     _verifyPeer = sslContextRep._verifyPeer;
     _certificateVerifyFunction = sslContextRep._certificateVerifyFunction;     _certificateVerifyFunction = sslContextRep._certificateVerifyFunction;
     _randomFile = sslContextRep._randomFile;     _randomFile = sslContextRep._randomFile;
  
     // Initialize SSL callbacks and increment the SSLContextRep object _counter.  
     {  
         AutoMutex autoMut(_countRepMutex);  
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
             "Value of Countrep in copy constructor %d", _countRep);  
         if ( _countRep == 0 )  
         {  
             init_ssl();  
         }  
   
         _countRep++;  
     }  // mutex unlocks here  
   
     _sslContext = _makeSSLContext();     _sslContext = _makeSSLContext();
   
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 684 
Line 541 
  
     SSL_CTX_free(_sslContext);     SSL_CTX_free(_sslContext);
  
     // Decrement the SSLContextRep object _counter.  
     {  
         AutoMutex autoMut(_countRepMutex);  
         _countRep--;  
         // Free SSL locks if no instances of SSLContextRep exist.  
   
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
             "Value of Countrep in destructor %d", _countRep);  
         if ( _countRep == 0 )  
         {  
             free_ssl();  
         }  
   
     }  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 711 
Line 554 
     Boolean ret;     Boolean ret;
     int retVal = 0;     int retVal = 0;
  
 #ifdef PEGASUS_SSL_RANDOMFILE  #if defined(PEGASUS_SSL_RANDOMFILE) && !defined(PEGASUS_OS_PASE)
     if ( RAND_status() == 0 )     if ( RAND_status() == 0 )
     {     {
         //         //
Line 719 
Line 562 
         //         //
         if ( randomFile == String::EMPTY )         if ( randomFile == String::EMPTY )
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL1,
                 "Random seed file is required.");                 "Random seed file is required.");
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             MessageLoaderParms parms(             MessageLoaderParms parms(
Line 737 
Line 580 
             retVal = RAND_load_file(randomFile.getCString(), -1);             retVal = RAND_load_file(randomFile.getCString(), -1);
             if ( retVal < 0 )             if ( retVal < 0 )
             {             {
                 PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,                  PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL1,
                     "Not enough seed data in seed file: " + randomFile);                      String("Not enough seed data in seed file: ") + randomFile);
                 PEG_METHOD_EXIT();                 PEG_METHOD_EXIT();
                 // do not put in $0 in default message, but pass in filename                 // do not put in $0 in default message, but pass in filename
                 // for bundle message                 // for bundle message
Line 751 
Line 594 
         }         }
         else         else
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,              PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL1,
                 "seed file - " + randomFile + " does not exist.");                  String("seed file - " + randomFile + " does not exist."));
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             MessageLoaderParms parms(             MessageLoaderParms parms(
                 "Common.SSLContext.SEED_FILE_DOES_NOT_EXIST",                 "Common.SSLContext.SEED_FILE_DOES_NOT_EXIST",
Line 779 
Line 622 
             int  seedRet = RAND_status();             int  seedRet = RAND_status();
             if ( seedRet == 0 )             if ( seedRet == 0 )
             {             {
                 PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,                  PEG_TRACE((TRC_SSL, Tracer::LEVEL1,
                     "Not enough seed data in random seed file, RAND_status = " +                      "Not enough seed data in random seed file, "
                     seedRet);                          "RAND_status = %d",
                       seedRet));
                 PEG_METHOD_EXIT();                 PEG_METHOD_EXIT();
                 // do not put in $0 in default message, but pass in filename                 // do not put in $0 in default message, but pass in filename
                 // for bundle message                 // for bundle message
Line 795 
Line 639 
     }     }
 #endif  /* PEGASUS_SSL_RANDOMFILE */ #endif  /* PEGASUS_SSL_RANDOMFILE */
  
   #ifdef PEGASUS_OS_PASE
       if (RAND_status() == 0)
       {
           // generate random number for pase must use specify function
           unsigned char prn[1024];
           umeGenerateRandomNumber(prn, sizeof(prn));
           RAND_seed(prn, 1024);
       }
   #endif
   
     int seedRet = RAND_status();     int seedRet = RAND_status();
     if (seedRet == 0)     if (seedRet == 0)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4,          PEG_TRACE((TRC_SSL, Tracer::LEVEL1,
             "Not enough seed data , RAND_status = " + seedRet );              "Not enough seed data, RAND_status = %d",
               seedRet));
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         MessageLoaderParms parms(         MessageLoaderParms parms(
             "Common.SSLContext.NOT_ENOUGH_SEED_DATA",             "Common.SSLContext.NOT_ENOUGH_SEED_DATA",
Line 866 
Line 721 
  
         if (_certificateVerifyFunction != NULL)         if (_certificateVerifyFunction != NULL)
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: certificate verification callback specified");                 "---> SSL: certificate verification callback specified");
             SSL_CTX_set_verify(sslContext,             SSL_CTX_set_verify(sslContext,
                 SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, prepareForCallback);                 SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, prepareForCallback);
         }         }
         else         else
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: Trust Store specified");                 "---> SSL: Trust Store specified");
             SSL_CTX_set_verify(sslContext,             SSL_CTX_set_verify(sslContext,
                 SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE |                 SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE |
Line 883 
Line 738 
     }     }
     else     else
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,          PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
             "---> SSL: Trust Store and certificate verification callback "             "---> SSL: Trust Store and certificate verification callback "
                 "are NOT specified");                 "are NOT specified");
         SSL_CTX_set_verify(sslContext, SSL_VERIFY_NONE, NULL);         SSL_CTX_set_verify(sslContext, SSL_VERIFY_NONE, NULL);
Line 906 
Line 761 
         //         //
         if (FileSystem::isDirectory(_trustStore))         if (FileSystem::isDirectory(_trustStore))
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
                             "---> SSL: Truststore is a directory");                             "---> SSL: Truststore is a directory");
             //             //
             // load certificates from the trust store             // load certificates from the trust store
             //             //
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,              PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: Loading certificates from the trust store: " +                  String("---> SSL: Loading certificates from the trust store: " +
                     _trustStore);                      _trustStore));
  
             if ((!SSL_CTX_load_verify_locations(             if ((!SSL_CTX_load_verify_locations(
                      sslContext, NULL, _trustStore.getCString())) ||                      sslContext, NULL, _trustStore.getCString())) ||
                 (!SSL_CTX_set_default_verify_paths(sslContext)))                 (!SSL_CTX_set_default_verify_paths(sslContext)))
             {             {
                 PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,                  PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL1,
                     "---> SSL: Could not load certificates from the trust "                      String("---> SSL: Could not load certificates from the "
                         "store: " + _trustStore);                          "trust store: " + _trustStore));
                 MessageLoaderParms parms(                 MessageLoaderParms parms(
                     "Common.SSLContext.COULD_NOT_LOAD_CERTIFICATES",                     "Common.SSLContext.COULD_NOT_LOAD_CERTIFICATES",
                     "Could not load certificates in to trust store.");                     "Could not load certificates in to trust store.");
Line 932 
Line 787 
         }         }
         else if (FileSystem::exists(_trustStore))         else if (FileSystem::exists(_trustStore))
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: Truststore is a file");                 "---> SSL: Truststore is a file");
             //             //
             // Get size of the trust store file:             // Get size of the trust store file:
Line 946 
Line 801 
                 //                 //
                 // load certificates from the trust store                 // load certificates from the trust store
                 //                 //
                 PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,                  PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
                     "---> SSL: Loading certificates from the trust store: " +                      String("---> SSL: Loading certificates from the trust "
                         _trustStore);                          "store: " + _trustStore));
  
                 if ((!SSL_CTX_load_verify_locations(                 if ((!SSL_CTX_load_verify_locations(
                          sslContext, _trustStore.getCString(), NULL)) ||                          sslContext, _trustStore.getCString(), NULL)) ||
                     (!SSL_CTX_set_default_verify_paths(sslContext)))                     (!SSL_CTX_set_default_verify_paths(sslContext)))
                 {                 {
                     PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,                      PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL1,
                         "---> SSL: Could not load certificates from the "                          String("---> SSL: Could not load certificates from the "
                             "trust store: " + _trustStore);                              "trust store: " + _trustStore));
                     MessageLoaderParms parms(                     MessageLoaderParms parms(
                         "Common.SSLContext.COULD_NOT_LOAD_CERTIFICATES",                         "Common.SSLContext.COULD_NOT_LOAD_CERTIFICATES",
                         "Could not load certificates in to trust store.");                         "Could not load certificates in to trust store.");
Line 970 
Line 825 
                 // no certificates found in the trust store                 // no certificates found in the trust store
                 //                 //
                 PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,                 PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,
                     "---> SSL: No certificates to load from the trust "                      String("---> SSL: No certificates to load from the trust "
                         "store: " + _trustStore);                          "store: " + _trustStore));
             }             }
         }         }
     }     }
Line 982 
Line 837 
         // one CRL for cimserver?         // one CRL for cimserver?
         X509_LOOKUP* pLookup;         X509_LOOKUP* pLookup;
  
         _crlStore = X509_STORE_new();          _crlStore.reset(X509_STORE_new());
           if (_crlStore.get() == NULL)
           {
               PEG_METHOD_EXIT();
               throw PEGASUS_STD(bad_alloc)();
           }
  
         // the validity of the crlstore was checked in ConfigManager         // the validity of the crlstore was checked in ConfigManager
         // during server startup         // during server startup
         if (FileSystem::isDirectory(_crlPath))         if (FileSystem::isDirectory(_crlPath))
         {         {
             Tracer::trace(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE((TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: CRL store is a directory in %s",                 "---> SSL: CRL store is a directory in %s",
                 (const char*)_crlPath.getCString());                  (const char*)_crlPath.getCString()));
  
             if ((pLookup = X509_STORE_add_lookup(             if ((pLookup = X509_STORE_add_lookup(
                      _crlStore, X509_LOOKUP_hash_dir())) == NULL)                       _crlStore.get(), X509_LOOKUP_hash_dir())) == NULL)
             {             {
                 MessageLoaderParms parms(                 MessageLoaderParms parms(
                     "Common.SSLContext.COULD_NOT_LOAD_CRLS",                     "Common.SSLContext.COULD_NOT_LOAD_CRLS",
                     "Could not load certificate revocation list.");                     "Could not load certificate revocation list.");
                 X509_STORE_free(_crlStore);                  _crlStore.reset();
                 PEG_METHOD_EXIT();                 PEG_METHOD_EXIT();
                 throw SSLException(parms);                 throw SSLException(parms);
             }             }
Line 1006 
Line 866 
             X509_LOOKUP_add_dir(             X509_LOOKUP_add_dir(
                 pLookup, (const char*)_crlPath.getCString(), X509_FILETYPE_PEM);                 pLookup, (const char*)_crlPath.getCString(), X509_FILETYPE_PEM);
  
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: Successfully configured CRL directory");                 "---> SSL: Successfully configured CRL directory");
         }         }
         else         else
         {         {
             Tracer::trace(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE((TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: CRL store is the file %s",                 "---> SSL: CRL store is the file %s",
                 (const char*)_crlPath.getCString());                  (const char*)_crlPath.getCString()));
  
             if ((pLookup = X509_STORE_add_lookup(             if ((pLookup = X509_STORE_add_lookup(
                    _crlStore, X509_LOOKUP_file())) == NULL)                     _crlStore.get(), X509_LOOKUP_file())) == NULL)
             {             {
                 MessageLoaderParms parms(                 MessageLoaderParms parms(
                     "Common.SSLContext.COULD_NOT_LOAD_CRLS",                     "Common.SSLContext.COULD_NOT_LOAD_CRLS",
                     "Could not load certificate revocation list.");                     "Could not load certificate revocation list.");
                 X509_STORE_free(_crlStore);                  _crlStore.reset();
                 PEG_METHOD_EXIT();                 PEG_METHOD_EXIT();
                 throw SSLException(parms);                 throw SSLException(parms);
             }             }
Line 1029 
Line 889 
             X509_LOOKUP_load_file(             X509_LOOKUP_load_file(
                 pLookup, (const char*)_crlPath.getCString(), X509_FILETYPE_PEM);                 pLookup, (const char*)_crlPath.getCString(), X509_FILETYPE_PEM);
  
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,              PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: Successfully configured CRL file");                 "---> SSL: Successfully configured CRL file");
         }         }
     }     }
Line 1046 
Line 906 
         //         //
         // load the specified server certificates         // load the specified server certificates
         //         //
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,          PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
             "---> SSL: Loading server certificate from: " + _certPath);              String("---> SSL: Loading server certificate from: " + _certPath));
  
         if (SSL_CTX_use_certificate_file(sslContext,         if (SSL_CTX_use_certificate_file(sslContext,
             _certPath.getCString(), SSL_FILETYPE_PEM) <=0)             _certPath.getCString(), SSL_FILETYPE_PEM) <=0)
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,              PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL1,
                 "---> SSL: No server certificate found in " + _certPath);                  String("---> SSL: No server certificate found in " +
                       _certPath));
             MessageLoaderParms parms(             MessageLoaderParms parms(
                 "Common.SSLContext.COULD_NOT_GET_SERVER_CERTIFICATE",                 "Common.SSLContext.COULD_NOT_GET_SERVER_CERTIFICATE",
                 "Could not get server certificate.");                 "Could not get server certificate.");
Line 1070 
Line 931 
         //         //
         if (_keyPath == String::EMPTY)         if (_keyPath == String::EMPTY)
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,              PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
                 "---> SSL: loading private key from: " + _certPath);                  String("---> SSL: loading private key from: " + _certPath));
             //             //
             // load the private key and check for validity             // load the private key and check for validity
             //             //
Line 1094 
Line 955 
     //     //
     if (_keyPath != String::EMPTY && !keyLoaded)     if (_keyPath != String::EMPTY && !keyLoaded)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,          PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
             "---> SSL: loading private key from: " + _keyPath);              String("---> SSL: loading private key from: " + _keyPath));
         //         //
         // load given private key and check for validity         // load given private key and check for validity
         //         //
Line 1124 
Line 985 
  
     if (!is)     if (!is)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,          PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL1,
             String("failed to open private key file: ") + String(keyPath));              String("failed to open private key file: " + keyPath));
         return false;         return false;
     }     }
  
Line 1136 
Line 997 
  
     if (!pkey)     if (!pkey)
     {     {
         PEG_TRACE_STRING(          PEG_TRACE_CSTRING(
             TRC_SSL, Tracer::LEVEL2, "failed to create private key");              TRC_SSL, Tracer::LEVEL1, "failed to create private key");
         return false;         return false;
     }     }
  
Line 1149 
Line 1010 
  
     if (SSL_CTX_use_PrivateKey(ctx, pkey) <= 0)     if (SSL_CTX_use_PrivateKey(ctx, pkey) <= 0)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,          EVP_PKEY_free(pkey);
             "---> SSL: no private key found in " + String(keyPath));          PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3,
               String("---> SSL: no private key found in " + keyPath));
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return false;         return false;
     }     }
  
       EVP_PKEY_free(pkey);
   
     // Check private key for validity.     // Check private key for validity.
  
     if (!SSL_CTX_check_private_key(ctx))     if (!SSL_CTX_check_private_key(ctx))
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2,          PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL1,
             "---> SSL: Private and public key do not match");             "---> SSL: Private and public key do not match");
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return false;         return false;
Line 1201 
Line 1065 
     return _crlPath;     return _crlPath;
 } }
  
 X509_STORE* SSLContextRep::getCRLStore() const  SharedPtr<X509_STORE, FreeX509STOREPtr> SSLContextRep::getCRLStore() const
 { {
     return _crlStore;     return _crlStore;
 } }
  
 void SSLContextRep::setCRLStore(X509_STORE* store) void SSLContextRep::setCRLStore(X509_STORE* store)
 { {
     _crlStore = store;      _crlStore.reset(store);
 } }
  
 Boolean SSLContextRep::isPeerVerificationEnabled() const Boolean SSLContextRep::isPeerVerificationEnabled() const
Line 1222 
Line 1086 
     return _certificateVerifyFunction;     return _certificateVerifyFunction;
 } }
  
   void SSLContextRep::validateCertificate()
   {
       BIO* in = BIO_new_file(_certPath.getCString(), "r");
       PEGASUS_ASSERT(in != NULL);
       X509* cert = PEM_read_bio_X509(in, NULL, 0, NULL);
       BIO_free(in);
       PEGASUS_ASSERT(cert != NULL);
   
       if (X509_cmp_current_time(X509_get_notBefore(cert)) > 0)
       {
           X509_free(cert);
           MessageLoaderParms parms(
              "Common.SSLContext.CERTIFICATE_NOT_YET_VALID",
              "Certificate $0 is not yet valid.",
              _certPath);
           throw SSLException(parms);
       }
   
       if (X509_cmp_current_time(X509_get_notAfter(cert)) < 0)
       {
           X509_free(cert);
           MessageLoaderParms parms(
              "Common.SSLContext.CERTIFICATE_EXPIRED",
              "Certificate $0 has expired.",
              _certPath);
           throw SSLException(parms);
       }
   
       X509_free(cert);
   }
   
 #else #else
  
 // //
Line 1265 
Line 1160 
  
 String SSLContextRep::getCRLPath() const { return String::EMPTY; } String SSLContextRep::getCRLPath() const { return String::EMPTY; }
  
 X509_STORE* SSLContextRep::getCRLStore() const { return NULL; }  SharedPtr<X509_STORE, FreeX509STOREPtr> SSLContextRep::getCRLStore() const
   {
       return SharedPtr<X509_STORE, FreeX509STOREPtr>();
   }
  
 void SSLContextRep::setCRLStore(X509_STORE* store) { } void SSLContextRep::setCRLStore(X509_STORE* store) { }
  
Line 1277 
Line 1175 
     return NULL;     return NULL;
 } }
  
 void SSLContextRep::init_ssl() {}  void SSLContextRep::validateCertificate() { }
   
 void SSLContextRep::free_ssl() {}  
  
 #endif // end of PEGASUS_HAS_SSL #endif // end of PEGASUS_HAS_SSL
  
Line 1397 
Line 1293 
 X509_STORE* SSLContext::getCRLStore() const X509_STORE* SSLContext::getCRLStore() const
 { {
 #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
     return _rep->getCRLStore();      return _rep->getCRLStore().get();
 #else #else
     MessageLoaderParms parms(     MessageLoaderParms parms(
         "Common.Exception.SSL_CRL_NOT_ENABLED_EXCEPTION",         "Common.Exception.SSL_CRL_NOT_ENABLED_EXCEPTION",
Line 1425 
Line 1321 
     return _rep->getSSLCertificateVerifyFunction();     return _rep->getSSLCertificateVerifyFunction();
 } }
  
   void SSLContext::_validateCertificate()
   {
       _rep->validateCertificate();
   }
   
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
 // //
 // SSLCertificateInfo // SSLCertificateInfo
Line 1630 
Line 1531 
     s.append(_rep->issuerName);     s.append(_rep->issuerName);
     s.append("\n");     s.append("\n");
  
     sprintf(buf, "Depth: %d\n", _rep->depth);      sprintf(buf, "Depth: %u\n", _rep->depth);
     s.append(buf);     s.append(buf);
  
     sprintf(buf, "Error code: %d\n", _rep->errorCode);      sprintf(buf, "Error code: %u\n", _rep->errorCode);
     s.append(buf);     s.append(buf);
  
     sprintf(buf, "Response (preverify) code: %d\n", _rep->respCode);      sprintf(buf, "Response (preverify) code: %u\n", _rep->respCode);
     s.append(buf);     s.append(buf);
  
     s.append("Error string: ");     s.append("Error string: ");
     s.append(_rep->errorString);     s.append(_rep->errorString);
     s.append("\n");     s.append("\n");
  
     sprintf(buf, "Version number: %d\n", _rep->versionNumber);      sprintf(buf, "Version number: %u\n", _rep->versionNumber);
     s.append(buf);     s.append(buf);
  
     sprintf(buf, "Serial number: %lu\n", _rep->serialNumber);      sprintf(buf, "Serial number: %lu\n", (unsigned long)_rep->serialNumber);
     s.append(buf);     s.append(buf);
  
     s.append("Not before date: ");     s.append("Not before date: ");
Line 1682 
Line 1583 
     _rep->crlStore = crlStore;     _rep->crlStore = crlStore;
 } }
  
   SSLCallbackInfo::SSLCallbackInfo(
       SSLCertificateVerifyFunction* verifyCert,
       X509_STORE* crlStore,
       String ipAddress)
   {
       _rep = new SSLCallbackInfoRep();
       _rep->verifyCertificateCallback = verifyCert;
       _rep->crlStore = crlStore;
       _rep->ipAddress = ipAddress;
   }
   
 SSLCallbackInfo::~SSLCallbackInfo() SSLCallbackInfo::~SSLCallbackInfo()
 { {
     PEG_METHOD_ENTER(TRC_SSL, "SSLCallbackInfo::~SSLCallbackInfo");     PEG_METHOD_ENTER(TRC_SSL, "SSLCallbackInfo::~SSLCallbackInfo");

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