Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 391183, rename libPKIX error string number type to pkix error number types

Browse Source 
r=alexei.volkov


git-svn-id: svn://10.0.0.236/trunk@236626 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelson%bolyard.com
2007-09-25 00:48:11 +00:00
parent a99d29a1d9
commit 7ffc27f95d
21 changed files with 217 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/security/nss/cmd/libpkix/perf/libpkix_buildthreads.c
View File

@@ -108,7 +108,7 @@ static PKIX_Error *loggerCallback(
PKIX_Logger *logger,
PKIX_PL_String *message,
PKIX_UInt32 logLevel,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
void *plContext)
{
char *msg = NULL;
@@ -117,7 +117,7 @@ static PKIX_Error *loggerCallback(
msg = PKIX_String2ASCII(message, plContext);
printf("Logging %s (%s): %s\n",
logLevels[logLevel],
PKIX_ERRORNAMES[logComponent],
PKIX_ERRORCLASSNAMES[logComponent],
msg);
PR_Free((void *)msg);

6
mozilla/security/nss/cmd/libpkix/pkix/top/test_validatechain_NB.c
View File

@@ -147,7 +147,7 @@ static PKIX_Error *loggerCallback(
PKIX_Logger *logger,
PKIX_PL_String *message,
PKIX_UInt32 logLevel,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
void *plContext)
{
#define resultSize 150
@@ -160,7 +160,7 @@ static PKIX_Error *loggerCallback(
PR_snprintf(result, resultSize,
"Logging %s (%s): %s",
levels[logLevel],
PKIX_ERRORNAMES[logComponent],
PKIX_ERRORCLASSNAMES[logComponent],
msg);
subTest(result);
@@ -171,7 +171,7 @@ cleanup:
static
void testLogErrors(
PKIX_ERRORNUM module,
PKIX_ERRORCLASS module,
PKIX_UInt32 loggingLevel,
PKIX_List *loggers,
void *plContext)

45
mozilla/security/nss/cmd/libpkix/pkix/util/test_error.c
View File

@@ -124,37 +124,34 @@ cleanup:
}
static
void testGetErrorCode(PKIX_Error *error, PKIX_Error *error2){
PKIX_UInt32 code;
void testGetErrorClass(PKIX_Error *error, PKIX_Error *error2)
{
PKIX_ERRORCLASS errClass;
PKIX_TEST_STD_VARS();
PKIX_TEST_EXPECT_NO_ERROR
(PKIX_Error_GetErrorCode(error, &code, plContext));
(PKIX_Error_GetErrorClass(error, &errClass, plContext));
if (code != PKIX_OBJECT_ERROR) {
testError("Incorrect Code Returned");
if (errClass != PKIX_OBJECT_ERROR) {
testError("Incorrect Class Returned");
}
PKIX_TEST_EXPECT_NO_ERROR
(PKIX_Error_GetErrorCode(error2, &code, plContext));
(PKIX_Error_GetErrorClass(error2, &errClass, plContext));
if (code != PKIX_MEM_ERROR) {
testError("Incorrect Code Returned");
if (errClass != PKIX_MEM_ERROR) {
testError("Incorrect Class Returned");
}
PKIX_TEST_EXPECT_NO_ERROR(PKIX_Error_GetErrorCode(PKIX_ALLOC_ERROR(),
&code, plContext));
if (code != PKIX_FATAL_ERROR) {
testError("Incorrect Code Returned");
PKIX_TEST_EXPECT_NO_ERROR(PKIX_Error_GetErrorClass(PKIX_ALLOC_ERROR(),
&errClass, plContext));
if (errClass != PKIX_FATAL_ERROR) {
testError("Incorrect Class Returned");
}
cleanup:
PKIX_TEST_RETURN();
}
static
@@ -163,7 +160,8 @@ void testGetDescription(
PKIX_Error *error2,
PKIX_Error *error3,
char *descChar,
char *descChar2){
char *descChar2)
{
PKIX_PL_String *targetString = NULL;
char *temp = NULL;
@@ -214,7 +212,8 @@ cleanup:
}
static
void testGetCause(PKIX_Error *error, PKIX_Error *error2, PKIX_Error *error3){
void testGetCause(PKIX_Error *error, PKIX_Error *error2, PKIX_Error *error3)
{
PKIX_Error *error4 = NULL;
PKIX_PL_String *targetString = NULL;
@@ -264,7 +263,8 @@ cleanup:
}
static
void testGetSupplementaryInfo(PKIX_Error *error, char *infoChar){
void testGetSupplementaryInfo(PKIX_Error *error, char *infoChar)
{
PKIX_PL_Object *targetString = NULL;
char *temp = NULL;
@@ -376,7 +376,8 @@ cleanup:
PKIX_TEST_RETURN();
}
int test_error(int argc, char *argv[]) {
int test_error(int argc, char *argv[])
{
PKIX_Error *error, *error2, *error3, *error5, *error6, *error7;
char *descChar = "Error Message";
@@ -410,8 +411,8 @@ int test_error(int argc, char *argv[]) {
Error,
PKIX_TRUE);
subTest("PKIX_Error_GetErrorCode");
testGetErrorCode(error, error2);
subTest("PKIX_Error_GetErrorClass");
testGetErrorClass(error, error2);
subTest("PKIX_Error_GetDescription");
testGetDescription(error, error2, error3, descChar, descChar2);

14
mozilla/security/nss/cmd/libpkix/pkix/util/test_logger.c
View File

@@ -60,7 +60,7 @@ PKIX_Error *testLoggerCallback(
PKIX_Logger *logger,
PKIX_PL_String *message,
PKIX_UInt32 logLevel,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
void *plContext)
{
char *comp = NULL;
@@ -72,7 +72,7 @@ PKIX_Error *testLoggerCallback(
msg = PKIX_String2ASCII(message, plContext);
PR_snprintf(result, 100, "Logging %s (%s): %s",
levels[logLevel], PKIX_ERRORNAMES[logComponent], msg);
levels[logLevel], PKIX_ERRORCLASSNAMES[logComponent], msg);
subTest(result);
callCount++;
@@ -91,7 +91,7 @@ PKIX_Error *testLoggerCallback2(
PKIX_Logger *logger,
PKIX_PL_String *message,
PKIX_UInt32 logLevel,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
void *plContext)
{
char *comp = NULL;
@@ -102,7 +102,7 @@ PKIX_Error *testLoggerCallback2(
msg = PKIX_String2ASCII(message, plContext);
PR_snprintf(result, 100, "Logging %s (%s): %s",
levels[logLevel], PKIX_ERRORNAMES[logComponent], msg);
levels[logLevel], PKIX_ERRORCLASSNAMES[logComponent], msg);
subTest(result);
cleanup:
@@ -159,8 +159,8 @@ cleanup:
static void
testComponent(PKIX_Logger *logger)
{
PKIX_ERRORNUM compName = (PKIX_ERRORNUM)NULL;
PKIX_ERRORNUM compNameReturn = (PKIX_ERRORNUM)NULL;
PKIX_ERRORCLASS compName = (PKIX_ERRORCLASS)NULL;
PKIX_ERRORCLASS compNameReturn = (PKIX_ERRORCLASS)NULL;
PKIX_Boolean cmpResult = PKIX_FALSE;
PKIX_TEST_STD_VARS();
@@ -168,7 +168,7 @@ testComponent(PKIX_Logger *logger)
PKIX_TEST_EXPECT_NO_ERROR(PKIX_Logger_GetLoggingComponent
(logger, &compName, plContext));
if (compName != (PKIX_ERRORNUM)NULL) {
if (compName != (PKIX_ERRORCLASS)NULL) {
testError("Incorrect Logger Component returned. expect <NULL>");
}

6
mozilla/security/nss/cmd/libpkix/pkix_pl/module/test_httpcertstore.c
View File

@@ -42,7 +42,8 @@
static void *plContext = NULL;
static
void printUsage(char *testname) {
void printUsage(char *testname)
{
char *fmt =
"USAGE: %s [-arenas] certDir certName\n";
printf(fmt, "test_httpcertstore");
@@ -121,7 +122,8 @@ cleanup:
return (NULL);
}
int test_httpcertstore(int argc, char *argv[]) {
int test_httpcertstore(int argc, char *argv[])
{
PKIX_UInt32 i = 0;
PKIX_UInt32 numCerts = 0;

12
mozilla/security/nss/cmd/libpkix/pkix_pl/module/test_socket.c
View File

@@ -91,14 +91,16 @@ char rcvBuf1[100];
char rcvBuf2[100];
static
void printUsage(char *testname) {
void printUsage(char *testname)
{
char *fmt = "USAGE: %s [-arenas] server:port\n";
printf(fmt, testname);
}
/* Functional tests for Socket public functions */
static
void do_other_work(void) { /* while waiting for nonblocking I/O to complete */
void do_other_work(void)
{ /* while waiting for nonblocking I/O to complete */
(void) PR_Sleep(2*60);
}
@@ -253,7 +255,8 @@ cleanup:
}
static
PKIX_Boolean client() {
PKIX_Boolean client()
{
PKIX_Boolean keepGoing = PKIX_FALSE;
PKIX_Int32 bytesRead = 0;
PKIX_Int32 bytesWritten = 0;
@@ -442,7 +445,8 @@ void dispatcher()
PKIX_TEST_RETURN();
}
int test_socket(int argc, char *argv[]) {
int test_socket(int argc, char *argv[])
{
int j = 0;
PKIX_UInt32 actualMinorVersion;

14
mozilla/security/nss/lib/certhigh/certvfypkix.c
View File

@@ -270,7 +270,6 @@ cert_NssCertificateUsageToPkixKUAndEKU(
PKIX_List *ekuOidsList = NULL;
PKIX_PL_OID *ekuOid = NULL;
PKIX_UInt32 keyUsage = 0;
PRUint32 certType;
int i = 0;
int ekuIndex = ekuIndexUnknown;
@@ -372,8 +371,9 @@ cert_ProcessingParamsSetKuAndEku(
PKIX_NULLCHECK_TWO(procParams, nssContext);
PKIX_CHECK(
pkix_pl_NssContext_SetCertUsage(1 << requiredCertUsage, nssContext),
PKIX_NSSCONTEXTSETCERTUSAGEFAILED);
pkix_pl_NssContext_SetCertUsage(
((SECCertificateUsage)1) << requiredCertUsage, nssContext),
PKIX_NSSCONTEXTSETCERTUSAGEFAILED);
PKIX_CHECK(
cert_NssCertificateUsageToPkixKUAndEKU(cert, requiredCertUsage,
@@ -798,7 +798,7 @@ cert_PkixErrorToNssCode(
unsigned long *nssCode,
void *plContext)
{
PKIX_ERRSTRINGNUM errorCode = 0; /* unknown pkix error code */
PKIX_ERRORCODE errorCode = 0; /* unknown pkix error code */
PKIX_ENTER(CERTVFYPKIX, "cert_PkixErrorToNssCode");
PKIX_NULLCHECK_ONE(nssCode);
@@ -851,8 +851,8 @@ cert_GetLogFromVerifyNode(
children = node->children;
if (children == NULL) {
PKIX_UInt32 code = PKIX_ANCHORDIDNOTCHAINTOCERT;
if (node->error && node->error->code != code) {
PKIX_ERRORCODE errCode = PKIX_ANCHORDIDNOTCHAINTOCERT;
if (node->error && node->error->errCode != errCode) {
#ifdef DEBUG
char *string = pkix_Error2ASCII(node->error, plContext);
printf("Branch search finished with error: \t%s\n", string);
@@ -878,7 +878,7 @@ cert_GetLogFromVerifyNode(
}
PKIX_RETURN(CERTVFYPKIX);
} else {
int i = 0;
PRUint32 i = 0;
PKIX_CHECK(
PKIX_List_GetLength(children, &length, plContext),

20
mozilla/security/nss/lib/libpkix/include/pkix_util.h
View File

@@ -146,7 +146,7 @@ typedef PKIX_Error *
PKIX_Logger *logger,
PKIX_PL_String *message,
PKIX_UInt32 logLevel,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
void *plContext);
/*
@@ -325,7 +325,7 @@ PKIX_Logger_SetMaxLoggingLevel(
PKIX_Error *
PKIX_Logger_GetLoggingComponent(
PKIX_Logger *logger,
PKIX_ERRORNUM *pComponent,
PKIX_ERRORCLASS *pComponent,
void *plContext);
/*
@@ -355,7 +355,7 @@ PKIX_Logger_GetLoggingComponent(
PKIX_Error *
PKIX_Logger_SetLoggingComponent(
PKIX_Logger *logger,
PKIX_ERRORNUM component,
PKIX_ERRORCLASS component,
void *plContext);
/*
@@ -497,19 +497,19 @@ PKIX_AddLogger(
*/
PKIX_Error *
PKIX_Error_Create(
PKIX_ERRORNUM errorCode,
PKIX_ERRORCLASS errClass,
PKIX_Error *cause,
PKIX_PL_Object *info,
PKIX_ERRSTRINGNUM descCode,
PKIX_ERRORCODE errCode,
PKIX_Error **pError,
void *plContext);
/*
* FUNCTION: PKIX_Error_GetErrorCode
* FUNCTION: PKIX_Error_GetErrorClass
* DESCRIPTION:
*
* Retrieves the error code of the Error pointed to by "error" and stores it
* at "pCode". Supported error codes are defined in pkixt.h.
* Retrieves the error class of the Error pointed to by "error" and
* stores it at "pClass". Supported error codes are defined in pkixt.h.
*
* PARAMETERS:
* "error"
@@ -526,9 +526,9 @@ PKIX_Error_Create(
* Returns a Fatal Error if the function fails in an unrecoverable way.
*/
PKIX_Error *
PKIX_Error_GetErrorCode(
PKIX_Error_GetErrorClass(
PKIX_Error *error,
PKIX_UInt32 *pCode,
PKIX_ERRORCLASS *pClass,
void *plContext);
/*

18
mozilla/security/nss/lib/libpkix/include/pkixt.h
View File

@@ -271,15 +271,15 @@ typedef enum { /* Now invoke all those TYPEMACROs to assign the numbers */
/* Error Codes
*
* This list is used to define a set of PKIX_Errors, each associated with an
* integer error code. ERRMACRO is redefined to produce a corresponding set of
* strings in the table "const char *PKIX_ERRORNAMES[PKIX_NUMERRORS]" in
* This list is used to define a set of PKIX_Error exception class numbers.
* ERRMACRO is redefined to produce a corresponding set of
* strings in the table "const char *PKIX_ERRORCLASSNAMES[PKIX_NUMERRORCLASSES]" in
* pkix_error.c. For example, since the fifth ERRMACRO entry is MUTEX, then
* PKIX_MUTEX_ERROR is defined in pkixt.h as 4, and PKIX_ERRORNAMES[4] is
* PKIX_MUTEX_ERROR is defined in pkixt.h as 4, and PKIX_ERRORCLASSNAMES[4] is
* initialized in pkix_error.c with the value "MUTEX".
*/
#define PKIX_ERRORS \
#define PKIX_ERRORCLASSES \
ERRMACRO(OBJECT), \
ERRMACRO(FATAL), \
ERRMACRO(MEM), \
@@ -353,9 +353,9 @@ typedef enum { /* Now invoke all those TYPEMACROs to assign the numbers */
#define ERRMACRO(type) PKIX_ ## type ## _ERROR
typedef enum { /* Now invoke all those ERRMACROs to assign the numbers */
PKIX_ERRORS,
PKIX_NUMERRORS /* This gets PKIX_NUMERRORS defined as the total number */
} PKIX_ERRORNUM;
PKIX_ERRORCLASSES,
PKIX_NUMERRORCLASSES /* This gets PKIX_NUMERRORCLASSES defined as the total number */
} PKIX_ERRORCLASS;
/* Now define error strings (for internationalization) */
@@ -364,7 +364,7 @@ typedef enum { /* Now invoke all those ERRMACROs to assign the numbers */
/* Define all the error numbers */
typedef enum {
#include "pkix_errorstrings.h"
} PKIX_ERRSTRINGNUM;
} PKIX_ERRORCODE;
extern const char * const PKIX_ErrorText[];

66
mozilla/security/nss/lib/libpkix/pkix/top/pkix_build.c
View File

@@ -851,10 +851,10 @@ pkix_Build_CheckCertAgainstAnchor(
(candidateCert, trustedPubKey, plContext);
if (pkixErrorResult) {
pkixTempResult = PKIX_Error_GetErrorCode
(pkixErrorResult, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(pkixErrorResult, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_CERTVERIFYSIGNATUREFAILED];
PKIX_RETURN(FATAL);
@@ -1138,12 +1138,12 @@ pkix_Build_VerifyCertificate(
plContext);
if (pkixErrorResult) {
pkixTempResult = PKIX_Error_GetErrorCode
pkixTempResult = PKIX_Error_GetErrorClass
(pkixErrorResult,
&pkixErrorCode,
&pkixErrorClass,
plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_USERCHECKERCHECKFAILED];
PKIX_RETURN(FATAL);
@@ -1190,10 +1190,10 @@ pkix_Build_VerifyCertificate(
(candidateCert, PKIX_KEY_CERT_SIGN, plContext);
if (pkixErrorResult) {
pkixTempResult = PKIX_Error_GetErrorCode
(pkixErrorResult, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(pkixErrorResult, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_CERTVERIFYKEYUSAGEFAILED];
PKIX_RETURN(FATAL);
@@ -1212,10 +1212,10 @@ pkix_Build_VerifyCertificate(
(state->prevCert, candidatePubKey, plContext);
if (pkixErrorResult) {
pkixTempResult = PKIX_Error_GetErrorCode
(pkixErrorResult, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(pkixErrorResult, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_CERTVERIFYSIGNATUREFAILED];
PKIX_RETURN(FATAL);
@@ -1256,12 +1256,12 @@ pkix_Build_VerifyCertificate(
(candidateCert, PKIX_KEY_CERT_SIGN, plContext);
if (pkixErrorResult) {
pkixTempResult = PKIX_Error_GetErrorCode
pkixTempResult = PKIX_Error_GetErrorClass
(pkixErrorResult,
&pkixErrorCode,
&pkixErrorClass,
plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_CERTVERIFYKEYUSAGEFAILED];
PKIX_RETURN(FATAL);
@@ -1669,10 +1669,10 @@ pkix_Build_ValidateEntireChain(
if (certCheckError) {
pkixTempErrorReceived = PKIX_TRUE;
pkixTempResult = PKIX_Error_GetErrorCode
(certCheckError, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(certCheckError, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR){
if (pkixErrorClass == PKIX_FATAL_ERROR){
pkixErrorMsg = PKIX_ErrorText[PKIX_CHECKCHAINFAILED];
PKIX_RETURN(FATAL);
}
@@ -2732,10 +2732,10 @@ pkix_BuildForwardDepthFirstSearch(
if (verifyError) {
pkixTempErrorReceived = PKIX_TRUE;
pkixTempResult = PKIX_Error_GetErrorCode
(verifyError, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(verifyError, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_BUILDVERIFYCERTIFICATEFAILED];
PKIX_RETURN(FATAL);
@@ -2803,10 +2803,10 @@ pkix_BuildForwardDepthFirstSearch(
plContext);
if (verifyError) {
pkixTempErrorReceived = PKIX_TRUE;
pkixTempResult = PKIX_Error_GetErrorCode
(verifyError, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(verifyError, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_DEFAULTCRLCHECKERCHECKHELPERFAILED];
PKIX_RETURN(FATAL);
@@ -3024,12 +3024,12 @@ pkix_BuildForwardDepthFirstSearch(
plContext);
if (verifyError) {
pkixTempErrorReceived = PKIX_TRUE;
pkixTempResult = PKIX_Error_GetErrorCode
pkixTempResult = PKIX_Error_GetErrorClass
(verifyError,
&pkixErrorCode,
&pkixErrorClass,
plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_DEFAULTCRLCHECKERCHECKHELPERFAILED];
PKIX_RETURN(FATAL);
@@ -3502,12 +3502,12 @@ pkix_Build_TryShortcut(
if (crlCheckerError) {
pkixTempErrorReceived = PKIX_TRUE;
pkixTempResult = PKIX_Error_GetErrorCode
pkixTempResult = PKIX_Error_GetErrorClass
(crlCheckerError,
&pkixErrorCode,
&pkixErrorClass,
plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_DEFAULTCRLCHECKERCHECKHELPERFAILED];
PKIX_RETURN(FATAL);
@@ -3779,10 +3779,10 @@ pkix_Build_InitiateBuildChain(
pkixErrorResult = PKIX_PL_Cert_CheckValidity
(targetCert, testDate, plContext);
if (pkixErrorResult) {
pkixTempResult = PKIX_Error_GetErrorCode
(pkixErrorResult, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(pkixErrorResult, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
pkixErrorMsg = PKIX_ErrorText[
PKIX_CERTCHECKVALIDITYFAILED];
PKIX_RETURN(FATAL);

6
mozilla/security/nss/lib/libpkix/pkix/top/pkix_policychecker.c
View File

@@ -2630,10 +2630,10 @@ pkix_PolicyChecker_Check(
subrErrorCleanup:
/* We had an error. Was it a fatal error? */
pkixTempResult = PKIX_Error_GetErrorCode
(subroutineErr, &pkixErrorCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(subroutineErr, &pkixErrorClass, plContext);
if (pkixTempResult) return pkixTempResult;
if (pkixErrorCode == PKIX_FATAL_ERROR) {
if (pkixErrorClass == PKIX_FATAL_ERROR) {
PKIX_THROW(FATAL, PKIX_POLICYCHECKERERROR);
}
/*

12
mozilla/security/nss/lib/libpkix/pkix/top/pkix_validate.c
View File

@@ -984,26 +984,26 @@ pkix_CheckChain(
pkixErrorReceived = PKIX_TRUE;
if (reasonCode ==
SEC_ERROR_OCSP_INVALID_SIGNING_CERT) {
pkixErrMsgNum =
pkixErrorCode =
PKIX_INVALIDSIGNINGCERTINOCSPRESPONSE;
} else if (reasonCode ==
SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS) {
pkixErrMsgNum =
pkixErrorCode =
PKIX_UNABLETOFINDSTATUSINOCSPRESPONSE;
} else if (reasonCode ==
SEC_ERROR_OCSP_MALFORMED_RESPONSE) {
pkixErrMsgNum =
pkixErrorCode =
PKIX_UNABLETOPARSEOCSPRESPONSE;
} else if (reasonCode ==
SEC_ERROR_REVOKED_CERTIFICATE_OCSP) {
pkixErrMsgNum =
pkixErrorCode =
PKIX_OCSPRESPONSESAYSCERTREVOKED;
} else {
pkixErrMsgNum =
pkixErrorCode =
PKIX_CERTREJECTEDBYREVOCATIONCHECKER;
}
PKIX_ERROR_CREATE
(VALIDATE, pkixErrMsgNum, pkixErrorResult);
(VALIDATE, pkixErrorCode, pkixErrorResult);
goto cleanup;
}

85
mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.c
View File

@@ -71,7 +71,8 @@ pkix_Error_Equals(
PKIX_Error *secondCause = NULL;
PKIX_PL_Object *firstInfo = NULL;
PKIX_PL_Object *secondInfo = NULL;
PKIX_UInt32 firstCode, secondCode, secondType;
PKIX_ERRORCLASS firstClass, secondClass;
PKIX_UInt32 secondType;
PKIX_Boolean boolResult, unequalFlag;
PKIX_ENTER(ERROR, "pkix_Error_Equals");
@@ -103,11 +104,11 @@ pkix_Error_Equals(
secondError = (PKIX_Error *) secondObject;
/* Compare error codes */
firstCode = firstError->code;
secondCode = secondError->code;
firstClass = firstError->errClass;
secondClass = secondError->errClass;
/* If codes differ, return false. Result is already set */
if (firstCode != secondCode) goto cleanup;
if (firstClass != secondClass) goto cleanup;
/* Compare causes */
firstCause = firstError->cause;
@@ -162,7 +163,7 @@ pkix_Error_Equals(
/* Compare descs */
if (firstError->descCode != secondError->descCode) {
if (firstError->errCode != secondError->errCode) {
unequalFlag = PKIX_TRUE;
}
@@ -227,7 +228,7 @@ pkix_Error_ToString(
PKIX_PL_String *optCauseString = NULL;
PKIX_PL_String *errorNameString = NULL;
char *format = NULL;
PKIX_UInt32 code;
PKIX_ERRORCLASS errClass;
PKIX_ENTER(ERROR, "pkix_Error_ToString");
PKIX_NULLCHECK_TWO(object, pString);
@@ -237,8 +238,8 @@ pkix_Error_ToString(
error = (PKIX_Error *)object;
/* Get this error's code, description and the string of its cause */
code = error->code;
/* Get this error's errClass, description and the string of its cause */
errClass = error->errClass;
/* Get the description string */
PKIX_Error_GetDescription(error, &desc, plContext);
@@ -286,14 +287,14 @@ pkix_Error_ToString(
format = "*** %s Error- %s";
}
/* Ensure that error code is known, otherwise default to Object */
if (code >= PKIX_NUMERRORS) {
code = 0;
/* Ensure that error errClass is known, otherwise default to Object */
if (errClass >= PKIX_NUMERRORCLASSES) {
errClass = 0;
}
PKIX_CHECK(PKIX_PL_String_Create
(PKIX_ESCASCII,
(void *)PKIX_ERRORNAMES[code],
(void *)PKIX_ERRORCLASSNAMES[errClass],
0,
&errorNameString,
plContext),
@@ -350,24 +351,24 @@ pkix_Error_Hashcode(
/* --Initializers------------------------------------------------- */
/*
* PKIX_ERRORNAMES is an array of strings, with each string holding a
* descriptive name for an error code. This is used by the default
* PKIX_ERRORCLASSNAMES is an array of strings, with each string holding a
* descriptive name for an error errClass. This is used by the default
* PKIX_PL_Error_ToString function.
*
* Note: PKIX_ERRORS is defined in pkixt.h as a list of error types.
* Note: PKIX_ERRORCLASSES is defined in pkixt.h as a list of error types.
* (More precisely, as a list of invocations of ERRMACRO(type).) The
* macro is expanded in pkixt.h to define error numbers, and here to
* provide corresponding strings. For example, since the fifth ERRMACRO
* entry is MUTEX, then PKIX_MUTEX_ERROR is defined in pkixt.h as 4, and
* PKIX_ERRORNAMES[4] is initialized here with the value "MUTEX".
* PKIX_ERRORCLASSNAMES[4] is initialized here with the value "MUTEX".
*/
#undef ERRMACRO
#define ERRMACRO(type) #type
const char *
PKIX_ERRORNAMES[PKIX_NUMERRORS] =
PKIX_ERRORCLASSNAMES[PKIX_NUMERRORCLASSES] =
{
PKIX_ERRORS
PKIX_ERRORCLASSES
};
/*
@@ -409,10 +410,10 @@ pkix_Error_RegisterSelf(void *plContext)
*/
PKIX_Error *
PKIX_Error_Create(
PKIX_ERRORNUM errorCode,
PKIX_ERRORCLASS errClass,
PKIX_Error *cause,
PKIX_PL_Object *info,
PKIX_ERRSTRINGNUM descCode,
PKIX_ERRORCODE errCode,
PKIX_Error **pError,
void *plContext)
{
@@ -435,7 +436,7 @@ PKIX_Error_Create(
if (pkixErrorResult) return (pkixErrorResult);
error->code = errorCode;
error->errClass = errClass;
/* Ensure we don't have a loop. Follow causes until NULL */
for (tempCause = cause;
@@ -453,43 +454,43 @@ PKIX_Error_Create(
PKIX_INCREF(info);
error->info = info;
error->descCode = descCode;
error->errCode = errCode;
*pError = error;
PKIX_RETURN(ERROR);
}
/*
* FUNCTION: PKIX_Error_GetErrorClass (see comments in pkix_util.h)
*/
PKIX_Error *
PKIX_Error_GetErrorClass(
PKIX_Error *error,
PKIX_ERRORCLASS *pClass,
void *plContext)
{
PKIX_ENTER(ERROR, "PKIX_Error_GetErrorClass");
PKIX_NULLCHECK_TWO(error, pClass);
*pClass = error->errClass;
PKIX_RETURN(ERROR);
}
/*
* FUNCTION: PKIX_Error_GetErrorCode (see comments in pkix_util.h)
*/
PKIX_Error *
PKIX_Error_GetErrorCode(
PKIX_Error *error,
PKIX_UInt32 *pCode,
PKIX_ERRORCODE *pCode,
void *plContext)
{
PKIX_ENTER(ERROR, "PKIX_Error_GetErrorCode");
PKIX_NULLCHECK_TWO(error, pCode);
*pCode = error->code;
PKIX_RETURN(ERROR);
}
/*
* FUNCTION: PKIX_Error_GetErrorCode (see comments in pkix_util.h)
*/
PKIX_Error *
PKIX_Error_GetErrorMsgCode(
PKIX_Error *error,
PKIX_UInt32 *pCode,
void *plContext)
{
PKIX_ENTER(ERROR, "PKIX_Error_GetDescErrorCode");
PKIX_NULLCHECK_TWO(error, pCode);
*pCode = error->descCode;
*pCode = error->errCode;
PKIX_RETURN(ERROR);
}
@@ -549,7 +550,7 @@ PKIX_Error_GetDescription(
PKIX_NULLCHECK_TWO(error, pDesc);
PKIX_PL_String_Create(PKIX_ESCASCII,
(void *)PKIX_ErrorText[error->descCode],
(void *)PKIX_ErrorText[error->errCode],
0,
&descString,
plContext);

4
mozilla/security/nss/lib/libpkix/pkix/util/pkix_error.h
View File

@@ -51,10 +51,10 @@ extern "C" {
#endif
struct PKIX_ErrorStruct {
PKIX_ERRORNUM code;
PKIX_ERRORCODE errCode;
PKIX_ERRORCLASS errClass; /* was formerly "code" */
PKIX_Error *cause;
PKIX_PL_Object *info;
PKIX_ERRSTRINGNUM descCode;
};
/* see source file for function documentation */

20
mozilla/security/nss/lib/libpkix/pkix/util/pkix_errpaths.c
View File

@@ -47,10 +47,10 @@
const PKIX_StdVars zeroStdVars;
PKIX_Error *
PKIX_DoThrow(PKIX_StdVars * stdVars, PKIX_ERRORNUM errorCode,
PKIX_ERRSTRINGNUM descNum, void *plContext)
PKIX_DoThrow(PKIX_StdVars * stdVars, PKIX_ERRORCLASS errClass,
PKIX_ERRORCODE errCode, void *plContext)
{
pkixTempResult = (PKIX_Error*)pkix_Throw(errorCode, myFuncName, descNum,
pkixTempResult = (PKIX_Error*)pkix_Throw(errClass, myFuncName, errCode,
pkixErrorResult, &pkixReturnResult, plContext);
if (pkixErrorResult != PKIX_ALLOC_ERROR())
PKIX_DECREF(pkixErrorResult);
@@ -60,13 +60,13 @@ PKIX_DoThrow(PKIX_StdVars * stdVars, PKIX_ERRORNUM errorCode,
}
PKIX_Error *
PKIX_DoReturn(PKIX_StdVars * stdVars, PKIX_ERRORNUM errorCode,
PKIX_DoReturn(PKIX_StdVars * stdVars, PKIX_ERRORCLASS errClass,
PKIX_Boolean doLogger, void *plContext)
{
PKIX_OBJECT_UNLOCK(lockedObject);
PKIX_MUTEX_UNLOCK(lockedMutex);
if ((pkixErrorReceived) || (pkixErrorResult))
return PKIX_DoThrow(stdVars, errorCode, pkixErrMsgNum, plContext);
return PKIX_DoThrow(stdVars, errClass, pkixErrorCode, plContext);
/* PKIX_DEBUG_EXIT(type); */
if (doLogger)
_PKIX_DEBUG_TRACE(pkixLoggersDebugTrace, "<<<", PKIX_LOGGER_LEVEL_TRACE);
@@ -74,14 +74,14 @@ PKIX_DoReturn(PKIX_StdVars * stdVars, PKIX_ERRORNUM errorCode,
}
PKIX_Error *
PKIX_DoCheck(PKIX_StdVars * stdVars, PKIX_ERRSTRINGNUM descNum, void *plContext)
PKIX_DoCheck(PKIX_StdVars * stdVars, PKIX_ERRORCODE errCode, void *plContext)
{
pkixTempResult =
PKIX_Error_GetErrorCode(pkixErrorResult, &pkixErrorCode, plContext);
PKIX_Error_GetErrorClass(pkixErrorResult, &pkixErrorClass, plContext);
if (pkixTempResult)
return pkixTempResult;
pkixErrorMsg = PKIX_ErrorText[descNum];
if (pkixErrorCode == PKIX_FATAL_ERROR)
return PKIX_DoReturn(stdVars, pkixErrorCode, PKIX_TRUE, plContext);
pkixErrorMsg = PKIX_ErrorText[errCode];
if (pkixErrorClass == PKIX_FATAL_ERROR)
return PKIX_DoReturn(stdVars, pkixErrorClass, PKIX_TRUE, plContext);
return NULL;
}

12
mozilla/security/nss/lib/libpkix/pkix/util/pkix_logger.c
View File

@@ -119,7 +119,7 @@ pkix_Logger_Check(
PKIX_List *pkixLoggersList,
const char *message,
const char *message2,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
PKIX_UInt32 currentLevel,
void *plContext)
{
@@ -317,7 +317,7 @@ pkix_Logger_Destroy(
logger->callback = NULL;
PKIX_DECREF(logger->context);
logger->logComponent = (PKIX_ERRORNUM)NULL;
logger->logComponent = (PKIX_ERRORCLASS)NULL;
cleanup:
@@ -371,7 +371,7 @@ pkix_Logger_ToString(
PKIX_CHECK(PKIX_PL_String_Create
(PKIX_ESCASCII,
(void *)PKIX_ERRORNAMES[logger->logComponent],
(void *)PKIX_ERRORCLASSNAMES[logger->logComponent],
0,
&componentString,
plContext),
@@ -617,7 +617,7 @@ PKIX_Logger_Create(
logger->callback = callback;
logger->maxLevel = 0;
logger->logComponent = (PKIX_ERRORNUM)NULL;
logger->logComponent = (PKIX_ERRORCLASS)NULL;
PKIX_INCREF(loggerContext);
logger->context = loggerContext;
@@ -710,7 +710,7 @@ cleanup:
PKIX_Error *
PKIX_Logger_GetLoggingComponent(
PKIX_Logger *logger,
PKIX_ERRORNUM *pComponent,
PKIX_ERRORCLASS *pComponent,
void *plContext)
{
PKIX_ENTER(LOGGER, "PKIX_Logger_GetLoggingComponent");
@@ -727,7 +727,7 @@ PKIX_Logger_GetLoggingComponent(
PKIX_Error *
PKIX_Logger_SetLoggingComponent(
PKIX_Logger *logger,
PKIX_ERRORNUM component,
PKIX_ERRORCLASS component,
void *plContext)
{
PKIX_ENTER(LOGGER, "PKIX_Logger_SetLoggingComponent");

4
mozilla/security/nss/lib/libpkix/pkix/util/pkix_logger.h
View File

@@ -58,7 +58,7 @@ struct PKIX_LoggerStruct {
PKIX_Logger_LogCallback callback;
PKIX_PL_Object *context;
PKIX_UInt32 maxLevel;
PKIX_ERRORNUM logComponent;
PKIX_ERRORCLASS logComponent;
};
PKIX_Error *
@@ -66,7 +66,7 @@ pkix_Logger_Check(
PKIX_List *pkixLoggersList,
const char *message,
const char *message2,
PKIX_ERRORNUM logComponent,
PKIX_ERRORCLASS logComponent,
PKIX_UInt32 maxLevel,
void *plContext);

20
mozilla/security/nss/lib/libpkix/pkix/util/pkix_tools.c
View File

@@ -159,39 +159,39 @@ cleanup:
*/
PKIX_Error *
pkix_Throw(
PKIX_UInt32 errorCode,
PKIX_ERRORCLASS errorClass,
const char *funcName,
PKIX_ERRSTRINGNUM errorTextCode,
PKIX_ERRORCODE errorCode,
PKIX_Error *cause,
PKIX_Error **pError,
void *plContext)
{
PKIX_UInt32 causeCode;
PKIX_ERRORCLASS causeClass;
PKIX_ENTER(ERROR, "pkix_Throw");
PKIX_NULLCHECK_TWO(funcName, pError);
*pError = NULL;
/* if cause has error code of PKIX_FATAL_ERROR, return immediately */
/* if cause has error class of PKIX_FATAL_ERROR, return immediately */
if (cause) {
pkixTempResult = PKIX_Error_GetErrorCode
(cause, &causeCode, plContext);
pkixTempResult = PKIX_Error_GetErrorClass
(cause, &causeClass, plContext);
if (pkixTempResult) goto cleanup;
if (causeCode == PKIX_FATAL_ERROR){
if (causeClass == PKIX_FATAL_ERROR){
*pError = cause;
goto cleanup;
}
}
pkixTempResult = PKIX_Error_Create(errorCode, cause, NULL,
errorTextCode, pError, plContext);
pkixTempResult = PKIX_Error_Create(errorClass, cause, NULL,
errorCode, pError, plContext);
cleanup:
PKIX_DEBUG_EXIT(ERROR);
pkixErrorCode = 0;
pkixErrorClass = 0;
return (pkixTempResult);
}

50
mozilla/security/nss/lib/libpkix/pkix/util/pkix_tools.h
View File

@@ -87,11 +87,11 @@ typedef struct pkixStdVarsStr {
PKIX_Error *aPkixErrorResult;
PKIX_Error *aPkixTempResult;
PKIX_Error *aPkixReturnResult;
PKIX_ERRSTRINGNUM aPkixErrMsgNum;
PKIX_ERRORCODE aPkixErrorCode;
const char *aPkixErrorMsg;
PKIX_Boolean aPkixErrorReceived;
PKIX_Boolean aPkixTempErrorReceived;
PKIX_UInt32 aPkixErrorCode;
PKIX_ERRORCLASS aPkixErrorClass;
PKIX_UInt32 aPkixType;
PKIX_PL_Object *aLockedObject;
PKIX_PL_Mutex *aLockedMutex;
@@ -102,11 +102,11 @@ typedef struct pkixStdVarsStr {
#define pkixErrorResult stdVars->aPkixErrorResult
#define pkixTempResult stdVars->aPkixTempResult
#define pkixReturnResult stdVars->aPkixReturnResult
#define pkixErrMsgNum stdVars->aPkixErrMsgNum
#define pkixErrorCode stdVars->aPkixErrorCode
#define pkixErrorMsg stdVars->aPkixErrorMsg
#define pkixErrorReceived stdVars->aPkixErrorReceived
#define pkixTempErrorReceived stdVars->aPkixTempErrorReceived
#define pkixErrorCode stdVars->aPkixErrorCode
#define pkixErrorClass stdVars->aPkixErrorClass
#define pkixType stdVars->aPkixType
#define lockedObject stdVars->aLockedObject
#define lockedMutex stdVars->aLockedMutex
@@ -115,28 +115,28 @@ typedef struct pkixStdVarsStr {
#define pkixErrorResult stdVars.aPkixErrorResult
#define pkixTempResult stdVars.aPkixTempResult
#define pkixReturnResult stdVars.aPkixReturnResult
#define pkixErrMsgNum stdVars.aPkixErrMsgNum
#define pkixErrorCode stdVars.aPkixErrorCode
#define pkixErrorMsg stdVars.aPkixErrorMsg
#define pkixErrorReceived stdVars.aPkixErrorReceived
#define pkixTempErrorReceived stdVars.aPkixTempErrorReceived
#define pkixErrorCode stdVars.aPkixErrorCode
#define pkixErrorClass stdVars.aPkixErrorClass
#define pkixType stdVars.aPkixType
#define lockedObject stdVars.aLockedObject
#define lockedMutex stdVars.aLockedMutex
#endif
extern PKIX_Error * PKIX_DoReturn(PKIX_StdVars * stdVars,
PKIX_ERRORNUM errorCode,
PKIX_ERRORCLASS errClass,
PKIX_Boolean doLogger,
void * plContext);
extern PKIX_Error * PKIX_DoThrow(PKIX_StdVars * stdVars,
PKIX_ERRORNUM errorCode,
PKIX_ERRSTRINGNUM descNum,
PKIX_ERRORCLASS errClass,
PKIX_ERRORCODE errCode,
void * plContext);
extern PKIX_Error * PKIX_DoCheck(PKIX_StdVars * stdVars,
PKIX_ERRSTRINGNUM descNum,
PKIX_ERRORCODE errCode,
void * plContext);
extern const PKIX_StdVars zeroStdVars;
@@ -258,7 +258,7 @@ extern const PKIX_StdVars zeroStdVars;
PKIX_OBJECT_UNLOCK(lockedObject); \
PKIX_MUTEX_UNLOCK(lockedMutex); \
if ((pkixErrorReceived) || (pkixErrorResult)) \
PKIX_THROW(type, pkixErrMsgNum); \
PKIX_THROW(type, pkixErrorCode); \
PKIX_DEBUG_EXIT(type); \
_PKIX_DEBUG_TRACE(pkixLoggersDebugTrace, "<<<", PKIX_LOGGER_LEVEL_TRACE); \
return NULL; \
@@ -274,7 +274,7 @@ extern const PKIX_StdVars zeroStdVars;
PKIX_OBJECT_UNLOCK(lockedObject); \
PKIX_MUTEX_UNLOCK(lockedMutex); \
if ((pkixErrorReceived) || (pkixErrorResult)) \
PKIX_THROW(type, pkixErrMsgNum); \
PKIX_THROW(type, pkixErrorCode); \
PKIX_DEBUG_EXIT(type); \
return NULL; \
}
@@ -290,13 +290,13 @@ extern const PKIX_StdVars zeroStdVars;
do { \
pkixErrorResult = (func); \
if (pkixErrorResult) { \
pkixTempResult = PKIX_Error_GetErrorCode \
(pkixErrorResult, &pkixErrorCode, plContext); \
pkixTempResult = PKIX_Error_GetErrorClass \
(pkixErrorResult, &pkixErrorClass, plContext); \
if (pkixTempResult) \
return pkixTempResult; \
pkixErrMsgNum = descNum; \
pkixErrorCode = descNum; \
pkixErrorMsg = PKIX_ErrorText[descNum]; \
if (pkixErrorCode == PKIX_FATAL_ERROR) \
if (pkixErrorClass == PKIX_FATAL_ERROR) \
PKIX_RETURN(FATAL); \
goto cleanup; \
} \
@@ -320,12 +320,12 @@ extern const PKIX_StdVars zeroStdVars;
pkixErrorResult = (func); \
if (pkixErrorResult) { \
pkixTempErrorReceived = PKIX_TRUE; \
pkixTempResult = PKIX_Error_GetErrorCode \
(pkixErrorResult, &pkixErrorCode, plContext); \
pkixTempResult = PKIX_Error_GetErrorClass \
(pkixErrorResult, &pkixErrorClass, plContext); \
if (pkixTempResult) \
return pkixTempResult; \
if (pkixErrorCode == PKIX_FATAL_ERROR){ \
pkixErrMsgNum = descNum; \
if (pkixErrorClass == PKIX_FATAL_ERROR){ \
pkixErrorCode = descNum; \
pkixErrorMsg = PKIX_ErrorText[descNum]; \
PKIX_RETURN(FATAL); \
} \
@@ -340,7 +340,7 @@ extern const PKIX_StdVars zeroStdVars;
{ \
PKIX_LOG_ERROR(descNum) \
pkixErrorReceived = PKIX_TRUE; \
pkixErrMsgNum = descNum; \
pkixErrorCode = descNum; \
pkixErrorMsg = PKIX_ErrorText[descNum]; \
goto cleanup; \
}
@@ -1366,11 +1366,11 @@ struct pkix_ClassTable_EntryStruct {
};
/*
* PKIX_ERRORNAMES is an array of strings, with each string holding a
* PKIX_ERRORCLASSNAMES is an array of strings, with each string holding a
* descriptive name for an error code. This is used by the default
* PKIX_PL_Error_ToString function.
*/
extern const char *PKIX_ERRORNAMES[PKIX_NUMERRORS];
extern const char *PKIX_ERRORCLASSNAMES[PKIX_NUMERRORCLASSES];
#define PKIX_MAGIC_HEADER (PKIX_UInt32) 0xBEEFC0DE
@@ -1384,9 +1384,9 @@ pkix_IsCertSelfIssued(
PKIX_Error *
pkix_Throw(
PKIX_UInt32 code,
PKIX_ERRORCLASS errClass,
const char *funcName,
PKIX_ERRSTRINGNUM errorTextCode,
PKIX_ERRORCODE errorTextCode,
PKIX_Error *cause,
PKIX_Error **pError,
void *plContext);

4
mozilla/security/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
View File

@@ -72,10 +72,10 @@ static PKIX_Alloc_Error_Object pkix_Alloc_Error_Data = {
(PKIX_UInt32)0, /* PKIX_UInt32 hashcode */
(PKIX_Boolean)PKIX_FALSE, /* PKIX_Boolean hashcodeCached */
}, {
(PKIX_ERRORNUM)PKIX_FATAL_ERROR,/* PKIX_UInt32 code */
(PKIX_ERRORCODE)0, /* PKIX_ERRORCODE errCode; */
(PKIX_ERRORCLASS)PKIX_FATAL_ERROR,/* PKIX_ERRORCLASS errClass */
(PKIX_Error *)0, /* PKIX_Error *cause */
(PKIX_PL_Object *)0, /* PKIX_PL_Object *info */
(PKIX_ERRSTRINGNUM)0, /* PKIX_ERRSTRINGNUM descCode; */
}
};

4
mozilla/security/nss/lib/nss/pkixpriv.def
View File

@@ -89,9 +89,9 @@ pkix_DefaultRevChecker_Initialize;
PKIX_Error_Create;
PKIX_Error_GetCause;
PKIX_Error_GetDescription;
PKIX_Error_GetErrorCode;
PKIX_Error_GetErrorClass;
PKIX_Error_GetSupplementaryInfo;
PKIX_ERRORNAMES DATA ;
PKIX_ERRORCLASSNAMES DATA ;
PKIX_Initialize;
PKIX_Initialize_SetConfigDir;
PKIX_List_AppendItem;