(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.61 and 1.62

version 1.61, 2005/12/21 06:20:17 version 1.62, 2006/01/03 15:00:52
Line 224 
Line 224 
     if (sslCRLStore == NULL)     if (sslCRLStore == NULL)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "---> SSL: CRL store is NULL");         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "---> SSL: CRL store is NULL");
           PEG_METHOD_EXIT();
         return 0;         return 0;
     }     }
  
Line 257 
Line 258 
     if (X509_STORE_get_by_subject(&crlStoreCtx, X509_LU_CRL, issuerName, &obj) <= 0)     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_TRACE_STRING(TRC_SSL, Tracer::LEVEL3, "---> SSL: No CRL by that issuer");
           PEG_METHOD_EXIT();
         return 0;         return 0;
     }     }
     X509_STORE_CTX_cleanup(&crlStoreCtx);     X509_STORE_CTX_cleanup(&crlStoreCtx);
Line 266 
Line 268 
     if (crl == NULL)     if (crl == NULL)
     {     {
         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL is null");         PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL is null");
           PEG_METHOD_EXIT();
         return 0;         return 0;
     } else     } else
     {     {
Line 289 
Line 292 
         {         {
             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2, "---> SSL: Certificate is revoked");             PEG_TRACE_STRING(TRC_SSL, Tracer::LEVEL2, "---> 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);
               PEG_METHOD_EXIT();
             return 1;             return 1;
         }         }
     }     }
Line 325 
Line 329 
     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);
  
     //  
     // If the SSLContext does not have an additional callback  
     // simply return the preverification error (or check the CRL)  
     // We do not need to go through the additional steps.  
     //  
     if (exData->_rep->verifyCertificateCallback == NULL)  
     {  
         Tracer::trace(TRC_SSL, Tracer::LEVEL4,  
                       "--->SSL: No verification callback specified");  
   
         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  
             {  
                 PEG_METHOD_EXIT();  
                 return 0;  
             }  
         }  
     }  
  
     //     //
     // Check to see if a CRL path is defined     // Check to see if a CRL path is defined


Legend:
Removed from v.1.61  
changed lines
  Added in v.1.62

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2