diff options
| author | wtc%google.com <devnull@localhost> | 2009-03-28 00:27:59 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-03-28 00:27:59 +0000 |
| commit | b7ae600340fc923cb3c16d8683b73834f7aa81bd (patch) | |
| tree | cbf6e755827d627176f24304d73fcd63cd443028 | |
| parent | e972018fb5033baf47fcf73f2eca8236c4a19dd8 (diff) | |
| download | nss-hg-b7ae600340fc923cb3c16d8683b73834f7aa81bd.tar.gz | |
Bug 453364: some more PKCS #11 error code mapping improvements. r=rrelyea.
Modified Files:
softoken/pkcs11c.c pk11wrap/pk11err.c
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11err.c | 3 | ||||
| -rw-r--r-- | security/nss/lib/softoken/pkcs11c.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/security/nss/lib/pk11wrap/pk11err.c b/security/nss/lib/pk11wrap/pk11err.c index 8714ea98e..a86cb3c66 100644 --- a/security/nss/lib/pk11wrap/pk11err.c +++ b/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/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c index 1320eeeb5..5ebbf8608 100644 --- a/security/nss/lib/softoken/pkcs11c.c +++ b/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; |