diff options
| author | richard.freedman%sun.com <devnull@localhost> | 2006-05-18 21:46:34 +0000 |
|---|---|---|
| committer | richard.freedman%sun.com <devnull@localhost> | 2006-05-18 21:46:34 +0000 |
| commit | 750174c1826896f228cfffb756446072cc22992f (patch) | |
| tree | ca40d7b5cc92edb588e2756c6b6307aa82cbd5f0 | |
| parent | 70b530e97c306f0354d615a5413262a400006b0a (diff) | |
| download | nss-hg-750174c1826896f228cfffb756446072cc22992f.tar.gz | |
Provide WIN32 function to return the address of PKIX_ERRORNAMES array,
since we are unable to reference it directly from the test directory.
4 files changed, 18 insertions, 1 deletions
diff --git a/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c b/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c index 9b175cb54..b89635e75 100644 --- a/security/nss/cmd/libpkix/pkix/top/validatechain_NB/test_validatechain_NB.c +++ b/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/security/nss/lib/libpkix/pkix/util/pkix_error.c b/security/nss/lib/libpkix/pkix/util/pkix_error.c index 82f66def5..26fd3876f 100755 --- a/security/nss/lib/libpkix/pkix/util/pkix_error.c +++ b/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/security/nss/lib/libpkix/pkix/util/pkix_error.h b/security/nss/lib/libpkix/pkix/util/pkix_error.h index 659a917d5..ebadeebb7 100755 --- a/security/nss/lib/libpkix/pkix/util/pkix_error.h +++ b/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/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index 45a0ab539..7fb5d2e06 100644 --- a/security/nss/lib/nss/nss.def +++ b/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; |