From 54c19f7f43849e95efcc10e381a5c53dab5351cf Mon Sep 17 00:00:00 2001 From: "julien.pierre.boogz%sun.com" Date: Tue, 14 Apr 2009 03:03:05 +0000 Subject: [PATCH] Fix for bug 488067 . Set SEC_ERROR_CRL_IMPORT_FAILED . r=nelson git-svn-id: svn://10.0.0.236/trunk@256909 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/cmd/lib/SECerrs.h | 4 ++++ mozilla/security/nss/lib/pk11wrap/pk11nobj.c | 1 + mozilla/security/nss/lib/util/secerr.h | 1 + 3 files changed, 6 insertions(+) diff --git a/mozilla/security/nss/cmd/lib/SECerrs.h b/mozilla/security/nss/cmd/lib/SECerrs.h index d8757cb012d..d00eefd1021 100644 --- a/mozilla/security/nss/cmd/lib/SECerrs.h +++ b/mozilla/security/nss/cmd/lib/SECerrs.h @@ -558,3 +558,7 @@ ER3(SEC_ERROR_PKCS11_DEVICE_ERROR, (SEC_ERROR_BASE + 169), ER3(SEC_ERROR_BAD_INFO_ACCESS_METHOD, (SEC_ERROR_BASE + 170), "Unknown information access method in certificate extension.") + +ER3(SEC_ERROR_CRL_IMPORT_FAILED, (SEC_ERROR_BASE + 171), +"Error attempting to import a CRL.") + diff --git a/mozilla/security/nss/lib/pk11wrap/pk11nobj.c b/mozilla/security/nss/lib/pk11wrap/pk11nobj.c index d94820bc4ae..412ba3ce5cb 100644 --- a/mozilla/security/nss/lib/pk11wrap/pk11nobj.c +++ b/mozilla/security/nss/lib/pk11wrap/pk11nobj.c @@ -527,6 +527,7 @@ PK11_PutCrl(PK11SlotInfo *slot, SECItem *crl, SECItem *name, nssCryptokiObject_Destroy(object); } else { rvH = CK_INVALID_HANDLE; + PORT_SetError(SEC_ERROR_CRL_IMPORT_FAILED); } return rvH; } diff --git a/mozilla/security/nss/lib/util/secerr.h b/mozilla/security/nss/lib/util/secerr.h index 48438c88c26..c1ce24662e0 100644 --- a/mozilla/security/nss/lib/util/secerr.h +++ b/mozilla/security/nss/lib/util/secerr.h @@ -226,6 +226,7 @@ SEC_ERROR_PKCS11_FUNCTION_FAILED = (SEC_ERROR_BASE + 168), SEC_ERROR_PKCS11_DEVICE_ERROR = (SEC_ERROR_BASE + 169), SEC_ERROR_BAD_INFO_ACCESS_METHOD = (SEC_ERROR_BASE + 170), +SEC_ERROR_CRL_IMPORT_FAILED = (SEC_ERROR_BASE + 171), /* Add new error codes above here. */ SEC_ERROR_END_OF_LIST