From 6f2f019571db698fcf430a3986817b2e0cf95180 Mon Sep 17 00:00:00 2001
From: "richard.freedman%sun.com"
 <richard.freedman%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 18 May 2006 21:46:34 +0000
Subject: [PATCH] Provide WIN32 function to return the address of
 PKIX_ERRORNAMES array, since we are unable to reference it directly from the
 test directory.

git-svn-id: svn://10.0.0.236/branches/NSS_LIBPKIX_BRANCH@197961 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../pkix/top/validatechain_NB/test_validatechain_NB.c     | 6 +++++-
 mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c   | 8 ++++++++
 mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.h   | 4 ++++
 mozilla/security/nss/lib/nss/nss.def                      | 1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mozilla/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c b/mozilla/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c
index 9b175cb54d9..b89635e750f 100644
--- a/mozilla/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c
+++ b/mozilla/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c
@@ -158,7 +158,11 @@ PKIX_Error *loggerCallback(
         PR_snprintf(result, resultSize,
             "Logging %s (%s): %s",
 	    levels[logLevel],
-	    PKIX_ERRORNAMES[logComponent],
+#if defined(_WIN32)
+	    PKIX_Error_GetErrorString(logComponent),
+#else
+            PKIX_ERRORNAMES[logComponent],
+#endif
 	    msg);
         subTest(result);
 
diff --git a/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c b/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c
index 82f66def549..26fd3876fed 100755
--- a/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c
+++ b/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c
@@ -548,3 +548,11 @@ PKIX_Error_GetDescription(
 
         PKIX_RETURN(ERROR);
 }
+
+#if defined(_WIN32)
+const char *
+PKIX_Error_GetErrorString(PKIX_ERRORNUM error)
+{
+        return PKIX_ERRORNAMES[error];
+}
+#endif
diff --git a/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.h b/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.h
index 659a917d522..ebadeebb795 100755
--- a/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.h
+++ b/mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.h
@@ -61,6 +61,10 @@ struct PKIX_ErrorStruct {
 
 PKIX_Error * pkix_Error_RegisterSelf(void *plContext);
 
+#if defined(_WIN32)
+const char *PKIX_Error_GetErrorString(PKIX_ERRORNUM error);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/mozilla/security/nss/lib/nss/nss.def b/mozilla/security/nss/lib/nss/nss.def
index 45a0ab539de..7fb5d2e06a9 100644
--- a/mozilla/security/nss/lib/nss/nss.def
+++ b/mozilla/security/nss/lib/nss/nss.def
@@ -954,6 +954,7 @@ PKIX_Error_GetCause;
 PKIX_Error_GetDescription;
 PKIX_Error_GetErrorCode;
 PKIX_Error_GetSupplementaryInfo;
+PKIX_Error_GetErrorString;
 PKIX_ERRORNAMES;
 PKIX_Initialize;
 PKIX_Initialize_SetConfigDir;