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

MBaesken · MBaesken · commit 8674e7cecc70 · 2022-11-25T11:27:35.000Z
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, 2021, 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
@@ -160,7 +160,7 @@ public void generate(String name) {
             }
 
         } catch (Exception e) {
-            throw new IllegalArgumentException(e.getMessage());
+            throw new IllegalArgumentException(e.getMessage(), e);
         }
         generateInternal();
     }
@@ -176,7 +176,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();
@@ -349,7 +349,7 @@ public X509Certificate getSelfCertificate (X500Name myname, Date firstDate,
 
         } catch (IOException e) {
              throw new CertificateEncodingException("getSelfCert: " +
-                                                    e.getMessage());
+                                                    e.getMessage(), e);
         }
     }
 
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
@@ -358,7 +358,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);
         }
     }
 
@@ -396,6 +396,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();
@@ -792,7 +796,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);
             }
         }
     }
@@ -952,7 +956,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);
         }
     }
 
@@ -964,7 +968,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);
             }
         }
     }
@@ -976,7 +980,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);
             }
         }
     }
@@ -1032,4 +1036,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
@@ -140,7 +140,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
@@ -1323,7 +1323,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
@@ -433,7 +433,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 = switch (algorithm) {
@@ -804,7 +804,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, 2021, 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`
`@@ -160,7 +160,7 @@ public void generate(String name) {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`} catch (Exception e) {`
`163`		`- throw new IllegalArgumentException(e.getMessage());`
	`163`	`+ throw new IllegalArgumentException(e.getMessage(), e);`
`164`	`164`	`}`
`165`	`165`	`generateInternal();`
`166`	`166`	`}`
`@@ -176,7 +176,7 @@ public void generate(int keyBits) {`
`176`	`176`	`keyGen.initialize(keyBits, prng);`
`177`	`177`
`178`	`178`	`} catch (Exception e) {`
`179`		`- throw new IllegalArgumentException(e.getMessage());`
	`179`	`+ throw new IllegalArgumentException(e.getMessage(), e);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`	`generateInternal();`
`@@ -349,7 +349,7 @@ public X509Certificate getSelfCertificate (X500Name myname, Date firstDate,`
`349`	`349`
`350`	`350`	`} catch (IOException e) {`
`351`	`351`	`throw new CertificateEncodingException("getSelfCert: " +`
`352`		`- e.getMessage());`
	`352`	`+ e.getMessage(), e);`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ private static String expand(final String s) throws IOException {`
`358`	`358`	`try {`
`359`	`359`	`return PropertyExpander.expand(s);`
`360`	`360`	`} catch (Exception e) {`
`361`		`- throw new RuntimeException(e.getMessage());`
	`361`	`+ throw new RuntimeException(e.getMessage(), e);`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`@@ -396,6 +396,10 @@ private ConfigurationException excLine(String msg) {`
`396`	`396`	`return new ConfigurationException(msg + ", line " + st.lineno());`
`397`	`397`	`}`
`398`	`398`
	`399`	`+ private ConfigurationException excLine(String msg, Throwable e) {`
	`400`	`+ return new ConfigurationException(msg + ", line " + st.lineno(), e);`
	`401`	`+ }`
	`402`	`+`
`399`	`403`	`private void parse() throws IOException {`
`400`	`404`	`while (true) {`
`401`	`405`	`int token = nextToken();`
`@@ -792,7 +796,7 @@ private long parseMechanism(String mech) throws IOException {`
`792`	`796`	`try {`
`793`	`797`	`return Functions.getMechanismId(mech);`
`794`	`798`	`} catch (IllegalArgumentException e) {`
`795`		`- throw excLine("Unknown mechanism: " + mech);`
	`799`	`+ throw excLine("Unknown mechanism: " + mech, e);`
`796`	`800`	`}`
`797`	`801`	`}`
`798`	`802`	`}`
`@@ -952,7 +956,7 @@ private long parseObjectClass() throws IOException {`
`952`	`956`	`try {`
`953`	`957`	`return Functions.getObjectClassId(name);`
`954`	`958`	`} catch (IllegalArgumentException e) {`
`955`		`- throw excLine("Unknown object class " + name);`
	`959`	`+ throw excLine("Unknown object class " + name, e);`
`956`	`960`	`}`
`957`	`961`	`}`
`958`	`962`
`@@ -964,7 +968,7 @@ private long parseKeyAlgorithm() throws IOException {`
`964`	`968`	`try {`
`965`	`969`	`return Functions.getKeyId(name);`
`966`	`970`	`} catch (IllegalArgumentException e) {`
`967`		`- throw excLine("Unknown key algorithm " + name);`
	`971`	`+ throw excLine("Unknown key algorithm " + name, e);`
`968`	`972`	`}`
`969`	`973`	`}`
`970`	`974`	`}`
`@@ -976,7 +980,7 @@ private long decodeAttributeName(String name) throws IOException {`
`976`	`980`	`try {`
`977`	`981`	`return Functions.getAttributeId(name);`
`978`	`982`	`} catch (IllegalArgumentException e) {`
`979`		`- throw excLine("Unknown attribute name " + name);`
	`983`	`+ throw excLine("Unknown attribute name " + name, e);`
`980`	`984`	`}`
`981`	`985`	`}`
`982`	`986`	`}`
`@@ -1032,4 +1036,8 @@ class ConfigurationException extends IOException {`
`1032`	`1036`	`ConfigurationException(String msg) {`
`1033`	`1037`	`super(msg);`
`1034`	`1038`	`}`
	`1039`	`+`
	`1040`	`+ ConfigurationException(String msg, Throwable e) {`
	`1041`	`+ super(msg, e);`
	`1042`	`+ }`
`1035`	`1043`	`}`
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
`@@ -1323,7 +1323,7 @@ private PrivateKey loadPkey(Session session, long oHandle)`
`1323`	`1323`	`RSAKeyFactory.checkKeyLengths(keyLength, null,`
`1324`	`1324`	`-1, Integer.MAX_VALUE);`
`1325`	`1325`	`} catch (InvalidKeyException e) {`
`1326`		`- throw new KeyStoreException(e.getMessage());`
	`1326`	`+ throw new KeyStoreException(e.getMessage(), e);`
`1327`	`1327`	`}`
`1328`	`1328`
`1329`	`1329`	`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
`@@ -433,7 +433,7 @@ private void checkRSAKeyLength(int len) throws InvalidKeyException {`
`433`	`433`	`padding = RSAPadding.getInstance`
`434`	`434`	`(RSAPadding.PAD_BLOCKTYPE_1, (len + 7) >> 3);`
`435`	`435`	`} catch (InvalidAlgorithmParameterException iape) {`
`436`		`- throw new InvalidKeyException(iape.getMessage());`
	`436`	`+ throw new InvalidKeyException(iape.getMessage(), iape);`
`437`	`437`	`}`
`438`	`438`	`int maxDataSize = padding.getMaxDataSize();`
`439`	`439`	`int encodedLength = switch (algorithm) {`
`@@ -804,7 +804,7 @@ private static byte[] dsaToASN1(byte[] signature) {`
`804`	`804`	`DerValue result = new DerValue(DerValue.tag_Sequence,`
`805`	`805`	`outseq.toByteArray());`
`806`	`806`	`return result.toByteArray();`
`807`		`- } catch (java.io.IOException e) {`
	`807`	`+ } catch (IOException e) {`
`808`	`808`	`throw new RuntimeException("Internal error", e);`
`809`	`809`	`}`
`810`	`810`	`}`