Skip to content

Commit 550e5d7

Browse files
driverktValerie Peng
driverkt
authored and
Valerie Peng
committedAug 30, 2022
4958071: (spec) confusing exception list for javax.crypto.Cipher.init(...) for
Reviewed-by: valeriep, wetmore
·
JEP-429-branchpoint
1 parent d3d2e66 commit 550e5d7

File tree

2 files changed

+120
-0
lines changed

2 files changed

+120
-0
lines changed
 

‎src/java.base/share/classes/javax/crypto/Cipher.java

+18
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,8 @@ private static void checkOpmode(int opmode) {
12391239
* @throws UnsupportedOperationException if {@code opmode} is
12401240
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
12411241
* by the underlying {@code CipherSpi}
1242+
* @throws InvalidParameterException if {@code opmode} is not one of the
1243+
* recognized values
12421244
*/
12431245
public final void init(int opmode, Key key) throws InvalidKeyException {
12441246
init(opmode, key, JCAUtil.getDefSecureRandom());
@@ -1294,6 +1296,8 @@ public final void init(int opmode, Key key) throws InvalidKeyException {
12941296
* @throws UnsupportedOperationException if {@code opmode} is
12951297
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
12961298
* by the underlying {@code CipherSpi}
1299+
* @throws InvalidParameterException if {@code opmode} is not one of the
1300+
* recognized values
12971301
*/
12981302
public final void init(int opmode, Key key, SecureRandom random)
12991303
throws InvalidKeyException
@@ -1379,6 +1383,9 @@ public final void init(int opmode, Key key, SecureRandom random)
13791383
* @throws UnsupportedOperationException if {@code opmode} is
13801384
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
13811385
* by the underlying {@code CipherSpi}
1386+
* @throws InvalidParameterException if {@code opmode} is not one of the
1387+
* recognized values
1388+
*
13821389
*/
13831390
public final void init(int opmode, Key key, AlgorithmParameterSpec params)
13841391
throws InvalidKeyException, InvalidAlgorithmParameterException
@@ -1441,6 +1448,9 @@ public final void init(int opmode, Key key, AlgorithmParameterSpec params)
14411448
* @throws UnsupportedOperationException if {@code opmode} is
14421449
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
14431450
* by the underlying {@code CipherSpi}
1451+
* @throws InvalidParameterException if {@code opmode} is not one of the
1452+
* recognized values
1453+
*
14441454
*/
14451455
public final void init(int opmode, Key key, AlgorithmParameterSpec params,
14461456
SecureRandom random)
@@ -1522,6 +1532,8 @@ public final void init(int opmode, Key key, AlgorithmParameterSpec params,
15221532
* @throws UnsupportedOperationException if {@code opmode} is
15231533
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
15241534
* by the underlying {@code CipherSpi}
1535+
* @throws InvalidParameterException if {@code opmode} is not one of the
1536+
* recognized values
15251537
*/
15261538
public final void init(int opmode, Key key, AlgorithmParameters params)
15271539
throws InvalidKeyException, InvalidAlgorithmParameterException
@@ -1584,6 +1596,8 @@ public final void init(int opmode, Key key, AlgorithmParameters params)
15841596
* @throws UnsupportedOperationException if {@code opmode} is
15851597
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
15861598
* by the underlying {@code CipherSpi}
1599+
* @throws InvalidParameterException if {@code opmode} is not one of the
1600+
* recognized values
15871601
*/
15881602
public final void init(int opmode, Key key, AlgorithmParameters params,
15891603
SecureRandom random)
@@ -1671,6 +1685,8 @@ public final void init(int opmode, Key key, AlgorithmParameters params,
16711685
* @throws UnsupportedOperationException if {@code opmode} is
16721686
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
16731687
* by the underlying {@code CipherSpi}
1688+
* @throws InvalidParameterException if {@code opmode} is not one of the
1689+
* recognized values
16741690
*/
16751691
public final void init(int opmode, Certificate certificate)
16761692
throws InvalidKeyException
@@ -1740,6 +1756,8 @@ public final void init(int opmode, Certificate certificate)
17401756
* @throws UnsupportedOperationException if {@code opmode} is
17411757
* {@code WRAP_MODE} or {@code UNWRAP_MODE} but the mode is not implemented
17421758
* by the underlying {@code CipherSpi}
1759+
* @throws InvalidParameterException if {@code opmode} is not one of the
1760+
* recognized values
17431761
*/
17441762
public final void init(int opmode, Certificate certificate,
17451763
SecureRandom random)

‎test/jdk/com/sun/crypto/provider/Cipher/Test4958071.java

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/*
25+
* @test
26+
* @library /test/lib
27+
* @bug 4958071
28+
* @summary verify InvalidParameterException for Cipher.init
29+
*/
30+
31+
import jdk.test.lib.Utils;
32+
33+
import javax.crypto.Cipher;
34+
import javax.crypto.KeyGenerator;
35+
import javax.crypto.SecretKey;
36+
import java.security.AlgorithmParameters;
37+
import java.security.InvalidParameterException;
38+
import java.security.SecureRandom;
39+
import java.security.cert.Certificate;
40+
import java.security.spec.AlgorithmParameterSpec;
41+
42+
public class Test4958071 {
43+
44+
public boolean execute() throws Exception {
45+
46+
KeyGenerator aesKey = KeyGenerator.getInstance("AES");
47+
aesKey.init(128);
48+
SecretKey generatedAESKey = aesKey.generateKey();
49+
50+
Cipher c = Cipher.getInstance("AES");
51+
52+
SecureRandom nullSR = null;
53+
AlgorithmParameters nullAP = null;
54+
AlgorithmParameterSpec nullAPS = null;
55+
Certificate nullCert = null;
56+
57+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
58+
generatedAESKey), InvalidParameterException.class);
59+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
60+
generatedAESKey), InvalidParameterException.class);
61+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
62+
generatedAESKey, nullSR), InvalidParameterException.class);
63+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
64+
generatedAESKey, nullSR), InvalidParameterException.class);
65+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
66+
generatedAESKey, nullAP), InvalidParameterException.class);
67+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
68+
generatedAESKey, nullAP), InvalidParameterException.class);
69+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
70+
generatedAESKey, nullAP, nullSR), InvalidParameterException.class);
71+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
72+
generatedAESKey, nullAP, nullSR), InvalidParameterException.class);
73+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
74+
generatedAESKey, nullAPS), InvalidParameterException.class);
75+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
76+
generatedAESKey, nullAPS), InvalidParameterException.class);
77+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
78+
generatedAESKey, nullAPS, nullSR), InvalidParameterException.class);
79+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
80+
generatedAESKey, nullAPS, nullSR), InvalidParameterException.class);
81+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
82+
nullCert), InvalidParameterException.class);
83+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
84+
nullCert), InvalidParameterException.class);
85+
Utils.runAndCheckException(() -> c.init((Cipher.ENCRYPT_MODE - 1),
86+
nullCert, nullSR), InvalidParameterException.class);
87+
Utils.runAndCheckException(() -> c.init((Cipher.UNWRAP_MODE + 1),
88+
nullCert, nullSR), InvalidParameterException.class);
89+
90+
return true;
91+
}
92+
93+
public static void main(String[] args) throws Exception {
94+
95+
Test4958071 test = new Test4958071();
96+
97+
if (test.execute()) {
98+
System.out.println(test.getClass().getName() + ": passed!");
99+
}
100+
101+
}
102+
}

0 commit comments

Comments
 (0)
Please sign in to comment.