From 0bcf17674e1c8c07ede3aef6449e0631e526ba86 Mon Sep 17 00:00:00 2001
From: Kevin Driver <kdriver@openjdk.org>
Date: Fri, 29 Jul 2022 20:30:28 +0000
Subject: [PATCH] 6227536: KeyGenerator.init() methods do not throw
 IllegalArgumentException for keysize == 0

Reviewed-by: wetmore
---
 .../crypto/provider/HmacMD5KeyGenerator.java  |  7 +-
 .../crypto/provider/HmacSHA1KeyGenerator.java |  7 +-
 .../provider/KeyGenerator/Test6227536.java    | 64 +++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/com/sun/crypto/provider/KeyGenerator/Test6227536.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
index e31f2ae20f4..ba29e3c7479 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
@@ -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);
     }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
index adad11c1c36..9d92d60ae36 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
@@ -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);
     }
diff --git a/test/jdk/com/sun/crypto/provider/KeyGenerator/Test6227536.java b/test/jdk/com/sun/crypto/provider/KeyGenerator/Test6227536.java
new file mode 100644
index 00000000000..43de6ead59a
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/KeyGenerator/Test6227536.java
@@ -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!");
+
+            }
+
+        }
+
+    }
+}