Mercurial > hg > release > icedtea7-forest-2.2 > jdk
changeset 2414:2dead33effe1
6944361: Missing CKR_ values in PKCS11Exception
Summary: Allow native NSS errors to be observed and correctly reported
Reviewed-by: wetmore, valeriep
author | andrew |
---|---|
date | Fri, 16 Apr 2010 09:54:13 +0100 |
parents | 3d1a836736bf |
children | 1ebd5cb2a44d |
files | src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java src/share/classes/sun/security/x509/X509Key.java |
diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Wed May 19 19:30:53 2010 +0100 +++ b/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Fri Apr 16 09:54:13 2010 +0100 @@ -148,6 +148,7 @@ 0x00000115, 0x00000120, 0x00000121, + 0x00000130, 0x00000150, 0x00000160, 0x00000170, @@ -156,6 +157,7 @@ 0x00000191, 0x000001A0, 0x000001A1, + 0x00000200, 0x80000000, }; String[] errorMessages = new String[] { @@ -234,6 +236,7 @@ "CKR_WRAPPING_KEY_TYPE_INCONSISTENT", "CKR_RANDOM_SEED_NOT_SUPPORTED", "CKR_RANDOM_NO_RNG", + "CKR_DOMAIN_PARAMS_INVALID", "CKR_BUFFER_TOO_SMALL", "CKR_SAVED_STATE_INVALID", "CKR_INFORMATION_SENSITIVE", @@ -242,6 +245,7 @@ "CKR_CRYPTOKI_ALREADY_INITIALIZED", "CKR_MUTEX_BAD", "CKR_MUTEX_NOT_LOCKED", + "CKR_FUNCTION_REJECTED", "CKR_VENDOR_DEFINED", }; errorMap = new HashMap<Long,String>();
--- a/src/share/classes/sun/security/x509/X509Key.java Wed May 19 19:30:53 2010 +0100 +++ b/src/share/classes/sun/security/x509/X509Key.java Fri Apr 16 09:54:13 2010 +0100 @@ -171,7 +171,7 @@ in.data.getUnalignedBitString()); } catch (InvalidKeyException e) { - throw new IOException("subject key, " + e.getMessage()); + throw new IOException("subject key, " + e.getMessage(), e); } if (in.data.available() != 0) @@ -224,7 +224,7 @@ } catch (NoSuchAlgorithmException e) { // Return generic X509Key with opaque key data (see below) } catch (InvalidKeySpecException e) { - throw new InvalidKeyException(e.getMessage()); + throw new InvalidKeyException(e.getMessage(), e); } /*