summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2008-09-22 20:28:34 +0000
committerwtc%google.com <devnull@localhost>2008-09-22 20:28:34 +0000
commit106151b4194ccd41959fad11eb1b0a80c04352dd (patch)
treed6c13e078e41ae485d12bc5a619d91f6648feceb
parent5c54d571a57a635f9587a67c777ef411d8c48a54 (diff)
downloadnss-hg-106151b4194ccd41959fad11eb1b0a80c04352dd.tar.gz
Bug 453364: Added three new error codes that are equivalent to the PKCS #11
error codes CKR_GENERAL_ERROR, CKR_FUNCTION_FAILED, and CKR_DEVICE_ERROR. r=nelson. Modified Files: cmd/lib/SECerrs.h lib/util/secerr.h
-rw-r--r--security/nss/cmd/lib/SECerrs.h9
-rw-r--r--security/nss/lib/util/secerr.h4
2 files changed, 13 insertions, 0 deletions
diff --git a/security/nss/cmd/lib/SECerrs.h b/security/nss/cmd/lib/SECerrs.h
index 3a26c9cb5..de81429b4 100644
--- a/security/nss/cmd/lib/SECerrs.h
+++ b/security/nss/cmd/lib/SECerrs.h
@@ -546,3 +546,12 @@ ER3(SEC_ERROR_BAD_INFO_ACCESS_LOCATION, (SEC_ERROR_BASE + 165),
ER3(SEC_ERROR_LIBPKIX_INTERNAL, (SEC_ERROR_BASE + 166),
"Libpkix internal error occured during cert validation.")
+
+ER3(SEC_ERROR_PKCS11_GENERAL_ERROR, (SEC_ERROR_BASE + 167),
+"A PKCS #11 module returned CKR_GENERAL_ERROR, indicating that an unrecoverable error has occurred.")
+
+ER3(SEC_ERROR_PKCS11_FUNCTION_FAILED, (SEC_ERROR_BASE + 168),
+"A PKCS #11 module returned CKR_FUNCTION_FAILED, indicating that the requested function could not be performed. Trying the same operation again might succeed.")
+
+ER3(SEC_ERROR_PKCS11_DEVICE_ERROR, (SEC_ERROR_BASE + 169),
+"A PKCS #11 module returned CKR_DEVICE_ERROR, indicating that a problem has occurred with the token or slot.")
diff --git a/security/nss/lib/util/secerr.h b/security/nss/lib/util/secerr.h
index 552e26313..0c29838cc 100644
--- a/security/nss/lib/util/secerr.h
+++ b/security/nss/lib/util/secerr.h
@@ -221,6 +221,10 @@ SEC_ERROR_BAD_INFO_ACCESS_LOCATION = (SEC_ERROR_BASE + 165),
SEC_ERROR_LIBPKIX_INTERNAL = (SEC_ERROR_BASE + 166),
+SEC_ERROR_PKCS11_GENERAL_ERROR = (SEC_ERROR_BASE + 167),
+SEC_ERROR_PKCS11_FUNCTION_FAILED = (SEC_ERROR_BASE + 168),
+SEC_ERROR_PKCS11_DEVICE_ERROR = (SEC_ERROR_BASE + 169),
+
/* Add new error codes above here. */
SEC_ERROR_END_OF_LIST
} SECErrorCodes;