8295405: Add cause in a couple of IllegalArgumentException and InvalidParameterException shown by sun/security/pkcs11 tests

MBaesken · MBaesken · commit 727ae39586fd · 2023-02-01T08:05:14.000Z
Reviewed-by: phh
Backport-of: d5d34241e21305379f1858556f225e7645cd294e
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java b/src/java.base/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,7 +144,7 @@ public void generate(String name) {
             }
 
         } catch (Exception e) {
-            throw new IllegalArgumentException(e.getMessage());
+            throw new IllegalArgumentException(e.getMessage(), e);
         }
         generateInternal();
     }
@@ -160,7 +160,7 @@ public void generate(int keyBits) {
                 keyGen.initialize(keyBits, prng);
 
             } catch (Exception e) {
-                throw new IllegalArgumentException(e.getMessage());
+                throw new IllegalArgumentException(e.getMessage(), e);
             }
         }
         generateInternal();
@@ -317,7 +317,7 @@ public X509Certificate getSelfCertificate (X500Name myname, Date firstDate,
 
         } catch (IOException e) {
              throw new CertificateEncodingException("getSelfCert: " +
-                                                    e.getMessage());
+                                                    e.getMessage(), e);
         } catch (InvalidAlgorithmParameterException e2) {
             throw new SignatureException(
                     "Unsupported PSSParameterSpec: " + e2.getMessage());
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
@@ -357,7 +357,7 @@ private static String expand(final String s) throws IOException {
         try {
             return PropertyExpander.expand(s);
         } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
+            throw new RuntimeException(e.getMessage(), e);
         }
     }
 
@@ -395,6 +395,10 @@ private ConfigurationException excLine(String msg) {
         return new ConfigurationException(msg + ", line " + st.lineno());
     }
 
+    private ConfigurationException excLine(String msg, Throwable e) {
+        return new ConfigurationException(msg + ", line " + st.lineno(), e);
+    }
+
     private void parse() throws IOException {
         while (true) {
             int token = nextToken();
@@ -799,7 +803,7 @@ private long parseMechanism(String mech) throws IOException {
             try {
                 return Functions.getMechanismId(mech);
             } catch (IllegalArgumentException e) {
-                throw excLine("Unknown mechanism: " + mech);
+                throw excLine("Unknown mechanism: " + mech, e);
             }
         }
     }
@@ -959,7 +963,7 @@ private long parseObjectClass() throws IOException {
         try {
             return Functions.getObjectClassId(name);
         } catch (IllegalArgumentException e) {
-            throw excLine("Unknown object class " + name);
+            throw excLine("Unknown object class " + name, e);
         }
     }
 
@@ -971,7 +975,7 @@ private long parseKeyAlgorithm() throws IOException {
             try {
                 return Functions.getKeyId(name);
             } catch (IllegalArgumentException e) {
-                throw excLine("Unknown key algorithm " + name);
+                throw excLine("Unknown key algorithm " + name, e);
             }
         }
     }
@@ -983,7 +987,7 @@ private long decodeAttributeName(String name) throws IOException {
             try {
                 return Functions.getAttributeId(name);
             } catch (IllegalArgumentException e) {
-                throw excLine("Unknown attribute name " + name);
+                throw excLine("Unknown attribute name " + name, e);
             }
         }
     }
@@ -1039,4 +1043,8 @@ class ConfigurationException extends IOException {
     ConfigurationException(String msg) {
         super(msg);
     }
+
+    ConfigurationException(String msg, Throwable e) {
+        super(msg, e);
+    }
 }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,7 +139,7 @@ private enum Transformation {
             try {
                 engineSetPadding(algoParts[2]);
             } catch (NoSuchPaddingException e) {
-                throw new NoSuchAlgorithmException();
+                throw new NoSuchAlgorithmException(e);
             }
         } else if (algoParts[0].equals("ChaCha20-Poly1305")) {
             fixedKeySize = 32;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
@@ -145,7 +145,7 @@ public void initialize(int keySize, SecureRandom random) {
         try {
             checkKeySize(keySize, null);
         } catch (InvalidAlgorithmParameterException e) {
-            throw new InvalidParameterException(e.getMessage());
+            throw (InvalidParameterException) new InvalidParameterException(e.getMessage()).initCause(e);
         }
         this.params = null;
         if (algorithm.equals("EC")) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyStore.java
@@ -1321,7 +1321,7 @@ private PrivateKey loadPkey(Session session, long oHandle)
                 RSAKeyFactory.checkKeyLengths(keyLength, null,
                     -1, Integer.MAX_VALUE);
             } catch (InvalidKeyException e) {
-                throw new KeyStoreException(e.getMessage());
+                throw new KeyStoreException(e.getMessage(), e);
             }
 
             return P11Key.privateKey(session,
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
@@ -440,7 +440,7 @@ private void checkRSAKeyLength(int len) throws InvalidKeyException {
             padding = RSAPadding.getInstance
                 (RSAPadding.PAD_BLOCKTYPE_1, (len + 7) >> 3);
         } catch (InvalidAlgorithmParameterException iape) {
-            throw new InvalidKeyException(iape.getMessage());
+            throw new InvalidKeyException(iape.getMessage(), iape);
         }
         int maxDataSize = padding.getMaxDataSize();
         int encodedLength;
@@ -801,7 +801,7 @@ private static byte[] dsaToASN1(byte[] signature) {
             DerValue result = new DerValue(DerValue.tag_Sequence,
                                            outseq.toByteArray());
             return result.toByteArray();
-        } catch (java.io.IOException e) {
+        } catch (IOException e) {
             throw new RuntimeException("Internal error", e);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -144,7 +144,7 @@ public void generate(String name) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`} catch (Exception e) {`
`147`		`- throw new IllegalArgumentException(e.getMessage());`
	`147`	`+ throw new IllegalArgumentException(e.getMessage(), e);`
`148`	`148`	`}`
`149`	`149`	`generateInternal();`
`150`	`150`	`}`
`@@ -160,7 +160,7 @@ public void generate(int keyBits) {`
`160`	`160`	`keyGen.initialize(keyBits, prng);`
`161`	`161`
`162`	`162`	`} catch (Exception e) {`
`163`		`- throw new IllegalArgumentException(e.getMessage());`
	`163`	`+ throw new IllegalArgumentException(e.getMessage(), e);`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`generateInternal();`
`@@ -317,7 +317,7 @@ public X509Certificate getSelfCertificate (X500Name myname, Date firstDate,`
`317`	`317`
`318`	`318`	`} catch (IOException e) {`
`319`	`319`	`throw new CertificateEncodingException("getSelfCert: " +`
`320`		`- e.getMessage());`
	`320`	`+ e.getMessage(), e);`
`321`	`321`	`} catch (InvalidAlgorithmParameterException e2) {`
`322`	`322`	`throw new SignatureException(`
`323`	`323`	`"Unsupported PSSParameterSpec: " + e2.getMessage());`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ private static String expand(final String s) throws IOException {`
`357`	`357`	`try {`
`358`	`358`	`return PropertyExpander.expand(s);`
`359`	`359`	`} catch (Exception e) {`
`360`		`- throw new RuntimeException(e.getMessage());`
	`360`	`+ throw new RuntimeException(e.getMessage(), e);`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`@@ -395,6 +395,10 @@ private ConfigurationException excLine(String msg) {`
`395`	`395`	`return new ConfigurationException(msg + ", line " + st.lineno());`
`396`	`396`	`}`
`397`	`397`
	`398`	`+ private ConfigurationException excLine(String msg, Throwable e) {`
	`399`	`+ return new ConfigurationException(msg + ", line " + st.lineno(), e);`
	`400`	`+ }`
	`401`	`+`
`398`	`402`	`private void parse() throws IOException {`
`399`	`403`	`while (true) {`
`400`	`404`	`int token = nextToken();`
`@@ -799,7 +803,7 @@ private long parseMechanism(String mech) throws IOException {`
`799`	`803`	`try {`
`800`	`804`	`return Functions.getMechanismId(mech);`
`801`	`805`	`} catch (IllegalArgumentException e) {`
`802`		`- throw excLine("Unknown mechanism: " + mech);`
	`806`	`+ throw excLine("Unknown mechanism: " + mech, e);`
`803`	`807`	`}`
`804`	`808`	`}`
`805`	`809`	`}`
`@@ -959,7 +963,7 @@ private long parseObjectClass() throws IOException {`
`959`	`963`	`try {`
`960`	`964`	`return Functions.getObjectClassId(name);`
`961`	`965`	`} catch (IllegalArgumentException e) {`
`962`		`- throw excLine("Unknown object class " + name);`
	`966`	`+ throw excLine("Unknown object class " + name, e);`
`963`	`967`	`}`
`964`	`968`	`}`
`965`	`969`
`@@ -971,7 +975,7 @@ private long parseKeyAlgorithm() throws IOException {`
`971`	`975`	`try {`
`972`	`976`	`return Functions.getKeyId(name);`
`973`	`977`	`} catch (IllegalArgumentException e) {`
`974`		`- throw excLine("Unknown key algorithm " + name);`
	`978`	`+ throw excLine("Unknown key algorithm " + name, e);`
`975`	`979`	`}`
`976`	`980`	`}`
`977`	`981`	`}`
`@@ -983,7 +987,7 @@ private long decodeAttributeName(String name) throws IOException {`
`983`	`987`	`try {`
`984`	`988`	`return Functions.getAttributeId(name);`
`985`	`989`	`} catch (IllegalArgumentException e) {`
`986`		`- throw excLine("Unknown attribute name " + name);`
	`990`	`+ throw excLine("Unknown attribute name " + name, e);`
`987`	`991`	`}`
`988`	`992`	`}`
`989`	`993`	`}`
`@@ -1039,4 +1043,8 @@ class ConfigurationException extends IOException {`
`1039`	`1043`	`ConfigurationException(String msg) {`
`1040`	`1044`	`super(msg);`
`1041`	`1045`	`}`
	`1046`	`+`
	`1047`	`+ ConfigurationException(String msg, Throwable e) {`
	`1048`	`+ super(msg, e);`
	`1049`	`+ }`
`1042`	`1050`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public void initialize(int keySize, SecureRandom random) {`
`145`	`145`	`try {`
`146`	`146`	`checkKeySize(keySize, null);`
`147`	`147`	`} catch (InvalidAlgorithmParameterException e) {`
`148`		`- throw new InvalidParameterException(e.getMessage());`
	`148`	`+ throw (InvalidParameterException) new InvalidParameterException(e.getMessage()).initCause(e);`
`149`	`149`	`}`
`150`	`150`	`this.params = null;`
`151`	`151`	`if (algorithm.equals("EC")) {`
Original file line number	Diff line number	Diff line change
`@@ -1321,7 +1321,7 @@ private PrivateKey loadPkey(Session session, long oHandle)`
`1321`	`1321`	`RSAKeyFactory.checkKeyLengths(keyLength, null,`
`1322`	`1322`	`-1, Integer.MAX_VALUE);`
`1323`	`1323`	`} catch (InvalidKeyException e) {`
`1324`		`- throw new KeyStoreException(e.getMessage());`
	`1324`	`+ throw new KeyStoreException(e.getMessage(), e);`
`1325`	`1325`	`}`
`1326`	`1326`
`1327`	`1327`	`return P11Key.privateKey(session,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ private void checkRSAKeyLength(int len) throws InvalidKeyException {`
`440`	`440`	`padding = RSAPadding.getInstance`
`441`	`441`	`(RSAPadding.PAD_BLOCKTYPE_1, (len + 7) >> 3);`
`442`	`442`	`} catch (InvalidAlgorithmParameterException iape) {`
`443`		`- throw new InvalidKeyException(iape.getMessage());`
	`443`	`+ throw new InvalidKeyException(iape.getMessage(), iape);`
`444`	`444`	`}`
`445`	`445`	`int maxDataSize = padding.getMaxDataSize();`
`446`	`446`	`int encodedLength;`
`@@ -801,7 +801,7 @@ private static byte[] dsaToASN1(byte[] signature) {`
`801`	`801`	`DerValue result = new DerValue(DerValue.tag_Sequence,`
`802`	`802`	`outseq.toByteArray());`
`803`	`803`	`return result.toByteArray();`
`804`		`- } catch (java.io.IOException e) {`
	`804`	`+ } catch (IOException e) {`
`805`	`805`	`throw new RuntimeException("Internal error", e);`
`806`	`806`	`}`
`807`	`807`	`}`