infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-18 09:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

6944361: Missing CKR_ values in PKCS11Exception

Browse Source 
Allow native NSS errors to be observed and correctly reported

Reviewed-by: wetmore, valeriep
This commit is contained in:
Andrew John Hughes 2010-04-16 09:54:13 +01:00
parent 592e8de4e1
commit 41515b3a35
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java
View File

@ -148,6 +148,7 @@ public class PKCS11Exception extends Exception {
0x00000115,
0x00000120,
0x00000121,
0x00000130,
0x00000150,
0x00000160,
0x00000170,
@ -156,6 +157,7 @@ public class PKCS11Exception extends Exception {
0x00000191,
0x000001A0,
0x000001A1,
0x00000200,
0x80000000,
};
String[] errorMessages = new String[] {
@ -234,6 +236,7 @@ public class PKCS11Exception extends Exception {
"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 @@ public class PKCS11Exception extends Exception {
"CKR_CRYPTOKI_ALREADY_INITIALIZED",
"CKR_MUTEX_BAD",
"CKR_MUTEX_NOT_LOCKED",
"CKR_FUNCTION_REJECTED",
"CKR_VENDOR_DEFINED",
};
errorMap = new HashMap<Long,String>();

4
jdk/src/share/classes/sun/security/x509/X509Key.java
View File

@ -171,7 +171,7 @@ public class X509Key implements PublicKey {
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 @@ public class X509Key implements PublicKey {
} 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);
}
/*