From 0f73f0dc02fadaa26aaba8506c656e2539a4ef33 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Sat, 28 Mar 2009 00:27:59 +0000 Subject: [PATCH] Bug 453364: some more PKCS #11 error code mapping improvements. r=rrelyea. Modified Files: softoken/pkcs11c.c pk11wrap/pk11err.c git-svn-id: svn://10.0.0.236/trunk@256730 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/pk11wrap/pk11err.c | 3 ++- mozilla/security/nss/lib/softoken/pkcs11c.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/security/nss/lib/pk11wrap/pk11err.c b/mozilla/security/nss/lib/pk11wrap/pk11err.c index 8714ea98eae..a86cb3c660f 100644 --- a/mozilla/security/nss/lib/pk11wrap/pk11err.c +++ b/mozilla/security/nss/lib/pk11wrap/pk11err.c @@ -84,6 +84,7 @@ PK11_MapError(CK_RV rv) { MAPERROR(CKR_DEVICE_ERROR, SEC_ERROR_PKCS11_DEVICE_ERROR) MAPERROR(CKR_DEVICE_MEMORY, SEC_ERROR_NO_MEMORY) MAPERROR(CKR_DEVICE_REMOVED, SEC_ERROR_NO_TOKEN) + MAPERROR(CKR_DOMAIN_PARAMS_INVALID, SEC_ERROR_INVALID_KEY) MAPERROR(CKR_ENCRYPTED_DATA_INVALID, SEC_ERROR_BAD_DATA) MAPERROR(CKR_ENCRYPTED_DATA_LEN_RANGE, SEC_ERROR_BAD_DATA) MAPERROR(CKR_FUNCTION_CANCELED, SEC_ERROR_LIBRARY_FAILURE) @@ -94,7 +95,7 @@ PK11_MapError(CK_RV rv) { MAPERROR(CKR_KEY_HANDLE_INVALID, SEC_ERROR_INVALID_KEY) MAPERROR(CKR_KEY_SIZE_RANGE, SEC_ERROR_INVALID_KEY) MAPERROR(CKR_KEY_TYPE_INCONSISTENT, SEC_ERROR_INVALID_KEY) - MAPERROR(CKR_MECHANISM_INVALID, SEC_ERROR_BAD_DATA) + MAPERROR(CKR_MECHANISM_INVALID, SEC_ERROR_INVALID_ALGORITHM) MAPERROR(CKR_MECHANISM_PARAM_INVALID, SEC_ERROR_BAD_DATA) MAPERROR(CKR_NO_EVENT, SEC_ERROR_NO_EVENT) MAPERROR(CKR_OBJECT_HANDLE_INVALID, SEC_ERROR_BAD_DATA) diff --git a/mozilla/security/nss/lib/softoken/pkcs11c.c b/mozilla/security/nss/lib/softoken/pkcs11c.c index 1320eeeb5c6..5ebbf860887 100644 --- a/mozilla/security/nss/lib/softoken/pkcs11c.c +++ b/mozilla/security/nss/lib/softoken/pkcs11c.c @@ -158,6 +158,8 @@ sftk_MapCryptError(int error) /* EC functions set this error if NSS_ENABLE_ECC is not defined */ case SEC_ERROR_UNSUPPORTED_KEYALG: return CKR_MECHANISM_INVALID; + case SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE: + return CKR_DOMAIN_PARAMS_INVALID; /* key pair generation failed after max number of attempts */ case SEC_ERROR_NEED_RANDOM: return CKR_FUNCTION_FAILED;