Uprev NSS to 3.18 RTM

nss/lib/certhigh/certvfypkix.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * nss_pkix_proxy.h
  *
  * PKIX - NSS proxy functions
  *
  * NOTE: All structures, functions, data types are parts of library private
  * api and are subjects to change in any following releases.
  *
  */
 #include "prerror.h"
 #include "prprf.h"
  
 #include "nspr.h"
 #include "pk11func.h"
 #include "certdb.h"
 #include "cert.h"
 #include "secerr.h"
 #include "nssb64.h"
 #include "secasn1.h"
 #include "secder.h"
 #include "pkit.h"
 
 #include "pkix_pl_common.h"
 
 extern PRLogModuleInfo *pkixLog;
 
-#ifdef DEBUG_volkov
-/* Temporary declarations of functioins. Will be removed with fix for
- * 391183 */
-extern char *
-pkix_Error2ASCII(PKIX_Error *error, void *plContext);
-
-extern void
-cert_PrintCert(PKIX_PL_Cert *pkixCert, void *plContext);
-
-extern PKIX_Error *
-cert_PrintCertChain(PKIX_List *pkixCertChain, void *plContext);
-
-#endif /* DEBUG */
-
 #ifdef PKIX_OBJECT_LEAK_TEST
 
 extern PKIX_UInt32
 pkix_pl_lifecycle_ObjectLeakCheck(int *);
 
 extern SECStatus
 pkix_pl_lifecycle_ObjectTableUpdate(int *objCountTable);
 
 PRInt32 parallelFnInvocationCount;
 #endif /* PKIX_OBJECT_LEAK_TEST */
@@ skipping 837 matching lines @@
     PKIX_List       *children = NULL;
     PKIX_VerifyNode *childNode = NULL;
 
     PKIX_ENTER(CERTVFYPKIX, "cert_GetLogFromVerifyNode");
 
     children = node->children;
 
     if (children == NULL) {
         PKIX_ERRORCODE errCode = PKIX_ANCHORDIDNOTCHAINTOCERT;
         if (node->error && node->error->errCode != errCode) {
-#ifdef DEBUG_volkov
-            char *string = pkix_Error2ASCII(node->error, plContext);
-            fprintf(stderr, "Branch search finished with error: \t%s\n", string);
-            PKIX_PL_Free(string, NULL);
-#endif
             if (log != NULL) {
                 SECErrorCodes nssErrorCode = 0;
                 CERTCertificate *cert = NULL;
 
                 cert = node->verifyCert->nssCert;
 
                 PKIX_CHECK(
                     cert_PkixErrorToNssCode(node->error, &nssErrorCode,
                                             plContext),
                     PKIX_GETPKIXERRORCODEFAILED);
@@ skipping 80 matching lines @@
     CERTCertificate **ptrustedRoot,
     CERTCertList    **pvalidChain,
     void             *plContext)
 {
     PKIX_ValidateResult *validResult = NULL;
     CERTCertList        *validChain = NULL;
     CERTCertificate     *trustedRoot = NULL;
     PKIX_TrustAnchor    *trustAnchor = NULL;
     PKIX_PL_Cert        *trustedCert = NULL;
     PKIX_List           *pkixCertChain = NULL;
-#ifdef DEBUG_volkov
-    PKIX_Error          *tmpPkixError = NULL;
-#endif /* DEBUG */
             
     PKIX_ENTER(CERTVFYPKIX, "cert_GetBuildResults");
     if (buildResult == NULL && error == NULL) {
         PKIX_ERROR(PKIX_NULLARGUMENT);
     }
 
     if (error) {
         SECErrorCodes nssErrorCode = 0;
-#ifdef DEBUG_volkov        
-        char *temp = pkix_Error2ASCII(error, plContext);
-        fprintf(stderr, "BUILD ERROR:\n%s\n", temp);
-        PKIX_PL_Free(temp, NULL);
-#endif /* DEBUG */
         if (verifyNode) {
             PKIX_Error *tmpError =
                 cert_GetLogFromVerifyNode(log, verifyNode, plContext);
             if (tmpError) {
                 PKIX_PL_Object_DecRef((PKIX_PL_Object *)tmpError, plContext);
             }
         }
         cert_PkixErrorToNssCode(error, &nssErrorCode, plContext);
         PORT_SetError(nssErrorCode);
         goto cleanup;
     }
 
     if (pvalidChain) {
         PKIX_CHECK(
             PKIX_BuildResult_GetCertChain(buildResult, &pkixCertChain,
                                           plContext),
             PKIX_BUILDRESULTGETCERTCHAINFAILED);
 
-#ifdef DEBUG_volkov
-        tmpPkixError = cert_PrintCertChain(pkixCertChain, plContext);
-        if (tmpPkixError) {
-            PKIX_PL_Object_DecRef((PKIX_PL_Object*)tmpPkixError, plContext);
-        }
-#endif        
-
         PKIX_CHECK(
             cert_PkixToNssCertsChain(pkixCertChain, &validChain, plContext),
             PKIX_CERTCHAINTONSSCHAINFAILED);
     }
 
     if (ptrustedRoot) {
         PKIX_CHECK(
             PKIX_BuildResult_GetValidateResult(buildResult, &validResult,
                                                plContext),
             PKIX_BUILDRESULTGETVALIDATERESULTFAILED);
 
         PKIX_CHECK(
             PKIX_ValidateResult_GetTrustAnchor(validResult, &trustAnchor,
                                                plContext),
             PKIX_VALIDATERESULTGETTRUSTANCHORFAILED);
 
         PKIX_CHECK(
             PKIX_TrustAnchor_GetTrustedCert(trustAnchor, &trustedCert,
                                             plContext),
             PKIX_TRUSTANCHORGETTRUSTEDCERTFAILED);
 
-#ifdef DEBUG_volkov
-        if (pvalidChain == NULL) {
-            cert_PrintCert(trustedCert, plContext);
-        }
-#endif        
-
-       PKIX_CHECK(
+        PKIX_CHECK(
             PKIX_PL_Cert_GetCERTCertificate(trustedCert, &trustedRoot,
                                             plContext),
             PKIX_CERTGETCERTCERTIFICATEFAILED);
     }
  
     PORT_Assert(!PKIX_ERROR_RECEIVED);
 
     if (trustedRoot) {
         *ptrustedRoot = trustedRoot;
     }
@@ skipping 66 matching lines @@
     PRBool          *pSigerror,
     PRBool          *pRevoked)
 {
     PKIX_ProcessingParams *procParams = NULL;
     PKIX_BuildResult      *result = NULL;
     PKIX_VerifyNode       *verifyNode = NULL;
     PKIX_Error            *error = NULL;
 
     SECStatus              rv = SECFailure;
     void                  *plContext = NULL;
-#ifdef DEBUG_volkov
-    CERTCertificate       *trustedRoot = NULL;
-    CERTCertList          *validChain = NULL;
-#endif /* DEBUG */
 
 #ifdef PKIX_OBJECT_LEAK_TEST
     int  leakedObjNum = 0;
     int  memLeakLoopCount = 0;
     int  objCountTable[PKIX_NUMTYPES]; 
     int  fnInvLocalCount = 0;
     PKIX_Boolean savedUsePkixEngFlag = usePKIXValidationEngine;
 
     if (usePKIXValidationEngine) {
         /* current memory leak testing implementation does not allow
@@ skipping 14 matching lines @@
     fnInvLocalCount = PR_ATOMIC_INCREMENT(&parallelFnInvocationCount);
     PORT_Assert(fnInvLocalCount == 1);
 
 do {
     rv = SECFailure;
     plContext = NULL;
     procParams = NULL;
     result = NULL;
     verifyNode = NULL;
     error = NULL;
-#ifdef DEBUG_volkov
-    trustedRoot = NULL;
-    validChain = NULL;
-#endif /* DEBUG */
     errorGenerated = PKIX_FALSE;
     stackPosition = 0;
 
     if (leakedObjNum) {
         pkix_pl_lifecycle_ObjectTableUpdate(objCountTable); 
     }
     memLeakLoopCount += 1;
 #endif /* PKIX_OBJECT_LEAK_TEST */
 
     error =
@@ skipping 22 matching lines @@
         /* Currently always PR_FALSE. Will be fixed as a part of 394077 */
         *pRevoked = PR_FALSE;
     }
     if (pSigerror) {
         /* Currently always PR_FALSE. Will be fixed as a part of 394077 */
         *pSigerror = PR_FALSE;
     }
     rv = SECSuccess;
 
 cleanup:
-    error = cert_GetBuildResults(result, verifyNode, error, log,
-#ifdef DEBUG_volkov                                 
-                                 &trustedRoot, &validChain,
-#else
-                                 NULL, NULL,
-#endif /* DEBUG */
+    error = cert_GetBuildResults(result, verifyNode, error, log, NULL, NULL,
                                  plContext);
     if (error) {
-#ifdef DEBUG_volkov        
-        char *temp = pkix_Error2ASCII(error, plContext);
-        fprintf(stderr, "GET BUILD RES ERRORS:\n%s\n", temp);
-        PKIX_PL_Free(temp, NULL);
-#endif /* DEBUG */
         PKIX_PL_Object_DecRef((PKIX_PL_Object *)error, plContext);
     }
-#ifdef DEBUG_volkov
-    if (trustedRoot) {
-        CERT_DestroyCertificate(trustedRoot);
-    }
-    if (validChain) {
-        CERT_DestroyCertList(validChain);
-    }
-#endif /* DEBUG */
     if (procParams) {
         PKIX_PL_Object_DecRef((PKIX_PL_Object *)procParams, plContext);
     }
     if (plContext) {
         PKIX_PL_NssContext_Destroy(plContext);
     }
 
 #ifdef PKIX_OBJECT_LEAK_TEST
     leakedObjNum =
         pkix_pl_lifecycle_ObjectLeakCheck(leakedObjNum ? objCountTable : NULL);
@@ skipping 1038 matching lines @@
     
 } while (errorGenerated);
 
     runningLeakTest = PKIX_FALSE; 
     PR_ATOMIC_DECREMENT(&parallelFnInvocationCount);
     usePKIXValidationEngine = savedUsePkixEngFlag;
 #endif /* PKIX_OBJECT_LEAK_TEST */
 
     return r;
 }