stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6227536: KeyGenerator.init() methods do not throw IllegalArgumentException for keysize == 0

Browse Source 
Reviewed-by: wetmore
This commit is contained in:
Kevin Driver 2022-07-29 20:30:28 +00:00 committed by Bradford Wetmore
parent cc2861a993
commit 0bcf17674e
3 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
@ -88,6 +88,11 @@ public final class HmacMD5KeyGenerator extends KeyGeneratorSpi {
* @param random the source of randomness for this key generator
*/
protected void engineInit(int keysize, SecureRandom random) {
if (keysize <= 0) {
throw new IllegalArgumentException("keysize must not be <= 0");
}
this.keysize = (keysize+7) / 8;
this.engineInit(random);
}

7
src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
@ -88,6 +88,11 @@ public final class HmacSHA1KeyGenerator extends KeyGeneratorSpi {
* @param random the source of randomness for this key generator
*/
protected void engineInit(int keysize, SecureRandom random) {
if (keysize <= 0) {
throw new IllegalArgumentException("keysize must not be <= 0");
}
this.keysize = (keysize+7) / 8;
this.engineInit(random);
}

64
test/jdk/com/sun/crypto/provider/KeyGenerator/Test6227536.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (c) 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @library /test/lib
* @bug 6227536
* @summary Verify HmacSHA1 and HmacMD5 KeyGenerators throw an Exception when
* a keysize of zero is requested
*/
import jdk.test.lib.Utils;
import javax.crypto.KeyGenerator;
public class Test6227536 {
String[] keyGensToTest = new String[]{"HmacSHA1", "HmacMD5"};
public boolean execute(String algo) throws Exception {
KeyGenerator kg = KeyGenerator.getInstance(algo, "SunJCE");
Utils.runAndCheckException(() -> kg.init(0),
IllegalArgumentException.class);
return true;
}
public static void main(String[] args) throws Exception {
Test6227536 test = new Test6227536();
String testName = test.getClass().getName();
for (String keyGenToTest : test.keyGensToTest) {
if (test.execute(keyGenToTest)) {
System.out.println(testName + ": " + keyGenToTest + " Passed!");
}
}
}
}