Bug 1050107: Remove lib/certhigh/certvfypkixprint.c from NSS

compilation, to remove dead code. r=ryan.sleevi,wtc.

3 files changed, 2 insertions, 275 deletions

diff --git a/lib/certhigh/certvfypkix.c b/lib/certhigh/certvfypkix.c
index 4a6859c95..dcb2dbf2c 100644
--- a/lib/certhigh/certvfypkix.c
+++ b/lib/certhigh/certvfypkix.c
@@ -27,20 +27,6 @@
 
 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
@@ -898,11 +884,6 @@ cert_GetLogFromVerifyNode(
     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;
@@ -1003,9 +984,6 @@ cert_GetBuildResults(
     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) {
@@ -1014,11 +992,6 @@ cert_GetBuildResults(
 
     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);
@@ -1037,13 +1010,6 @@ cert_GetBuildResults(
                                           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);
@@ -1065,13 +1031,7 @@ cert_GetBuildResults(
                                             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);
@@ -1158,10 +1118,6 @@ cert_VerifyCertChainPkix(
 
     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;
@@ -1196,10 +1152,6 @@ do {
     result = NULL;
     verifyNode = NULL;
     error = NULL;
-#ifdef DEBUG_volkov
-    trustedRoot = NULL;
-    validChain = NULL;
-#endif /* DEBUG */
     errorGenerated = PKIX_FALSE;
     stackPosition = 0;
 
@@ -1242,29 +1194,11 @@ do {
     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);
     }
diff --git a/lib/certhigh/certvfypkixprint.c b/lib/certhigh/certvfypkixprint.c
deleted file mode 100644
index d08d1be65..000000000
--- a/lib/certhigh/certvfypkixprint.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* 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
- *
- */
-#include "cert.h"
-#include "pkix_pl_common.h"
-
-#ifdef DEBUG
-
-char *
-pkix_Error2ASCII(PKIX_Error *error, void *plContext)
-{
-        PKIX_UInt32 length;
-        char *asciiString = NULL;
-        PKIX_PL_String *pkixString = NULL;
-        PKIX_Error *errorResult = NULL;
-
-        errorResult = PKIX_PL_Object_ToString
-                ((PKIX_PL_Object*)error, &pkixString, plContext);
-        if (errorResult) goto cleanup;
-
-        errorResult = PKIX_PL_String_GetEncoded
-                (pkixString,
-                PKIX_ESCASCII,
-                (void **)&asciiString,
-                &length,
-                plContext);
-
-cleanup:
-
-        if (pkixString){
-                if (PKIX_PL_Object_DecRef
-                    ((PKIX_PL_Object*)pkixString, plContext)){
-                        return (NULL);
-                }
-        }
-
-        if (errorResult){
-            PKIX_PL_Object_DecRef((PKIX_PL_Object*)errorResult, plContext);
-            return (NULL);
-        }
-
-        return (asciiString);
-}
-
-char *
-pkix_Object2ASCII(PKIX_PL_Object *object)
-{
-        PKIX_UInt32 length;
-        char *asciiString = NULL;
-        PKIX_PL_String *pkixString = NULL;
-        PKIX_Error *errorResult = NULL;
-
-        errorResult = PKIX_PL_Object_ToString
-                (object, &pkixString, NULL);
-        if (errorResult) goto cleanup;
-
-        errorResult = PKIX_PL_String_GetEncoded
-            (pkixString, PKIX_ESCASCII, (void **)&asciiString, &length, NULL);
-
-cleanup:
-
-        if (pkixString){
-                if (PKIX_PL_Object_DecRef((PKIX_PL_Object*)pkixString, NULL)){
-                        return (NULL);
-                }
-        }
-
-        if (errorResult){
-                return (NULL);
-        }
-
-        return (asciiString);
-}
-
-char *
-pkix_Cert2ASCII(PKIX_PL_Cert *cert)
-{
-        PKIX_PL_X500Name *issuer = NULL;
-        void *issuerAscii = NULL;
-        PKIX_PL_X500Name *subject = NULL;
-        void *subjectAscii = NULL;
-        void *asciiString = NULL;
-        PKIX_Error *errorResult = NULL;
-        PKIX_UInt32 numChars;
-        PKIX_UInt32 refCount = 0;
-
-        /* Issuer */
-        errorResult = PKIX_PL_Cert_GetIssuer(cert, &issuer, NULL);
-        if (errorResult) goto cleanup;
-
-        issuerAscii = pkix_Object2ASCII((PKIX_PL_Object*)issuer);
-
-        /* Subject */
-        errorResult = PKIX_PL_Cert_GetSubject(cert, &subject, NULL);
-        if (errorResult) goto cleanup;
-
-        if (subject){
-                subjectAscii = pkix_Object2ASCII((PKIX_PL_Object*)subject);
-        }
-
-/*         errorResult = PKIX_PL_Object_GetRefCount((PKIX_PL_Object*)cert, &refCount, NULL); */
-        if (errorResult) goto cleanup;
-
-        errorResult = PKIX_PL_Malloc(200, &asciiString, NULL);
-        if (errorResult) goto cleanup;
-
-        numChars =
-                PR_snprintf
-                (asciiString,
-                200,
-                "Ref: %d   Subject=%s\nIssuer=%s\n",
-                 refCount,
-                subjectAscii,
-                issuerAscii);
-
-        if (!numChars) goto cleanup;
-
-cleanup:
-
-        if (issuer){
-                if (PKIX_PL_Object_DecRef((PKIX_PL_Object*)issuer, NULL)){
-                        return (NULL);
-                }
-        }
-
-        if (subject){
-                if (PKIX_PL_Object_DecRef((PKIX_PL_Object*)subject, NULL)){
-                        return (NULL);
-                }
-        }
-
-        if (PKIX_PL_Free((PKIX_PL_Object*)issuerAscii, NULL)){
-                return (NULL);
-        }
-
-        if (PKIX_PL_Free((PKIX_PL_Object*)subjectAscii, NULL)){
-                return (NULL);
-        }
-
-        if (errorResult){
-                return (NULL);
-        }
-
-        return (asciiString);
-}
-
-PKIX_Error *
-cert_PrintCertChain(
-    PKIX_List *pkixCertChain,
-    void *plContext)
-{
-    PKIX_PL_Cert *cert = NULL;
-    PKIX_UInt32 numCerts = 0, i = 0;
-    char *asciiResult = NULL;
-    
-    PKIX_ENTER(CERTVFYPKIX, "cert_PrintCertChain");
-
-    PKIX_CHECK(
-        PKIX_List_GetLength(pkixCertChain, &numCerts, plContext),
-        PKIX_LISTGETLENGTHFAILED);
-    
-    fprintf(stderr, "\n");
-    
-    for (i = 0; i < numCerts; i++){
-        PKIX_CHECK
-            (PKIX_List_GetItem
-             (pkixCertChain, i, (PKIX_PL_Object**)&cert, plContext),
-             PKIX_LISTGETITEMFAILED);
-        
-        asciiResult = pkix_Cert2ASCII(cert);
-        
-        fprintf(stderr, "CERT[%d]:\n%s\n", i, asciiResult);
-        
-        PKIX_PL_Free(asciiResult, plContext);
-        asciiResult = NULL;
-        
-        PKIX_DECREF(cert);
-    }
-
-cleanup:
-    PKIX_DECREF(cert);
-
-    PKIX_RETURN(CERTVFYPKIX);
-}
-
-void
-cert_PrintCert(
-    PKIX_PL_Cert *pkixCert,
-    void *plContext)
-{
-    char *asciiResult = NULL;
-    
-    asciiResult = pkix_Cert2ASCII(pkixCert);
-    
-    fprintf(stderr, "CERT[0]:\n%s\n", asciiResult);
-    
-    PKIX_PL_Free(asciiResult, plContext);
-}
-
-#endif /* DEBUG */
diff --git a/lib/certhigh/manifest.mn b/lib/certhigh/manifest.mn
index c025d7be9..ed9b9108a 100644
--- a/lib/certhigh/manifest.mn
+++ b/lib/certhigh/manifest.mn
@@ -25,7 +25,6 @@ CSRCS = \
 	certhigh.c \
  	certvfy.c \
  	certvfypkix.c \
- 	certvfypkixprint.c \
  	xcrldist.c \
 	$(NULL)