--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/crypto/provider/Cipher/ChaCha20/ChaCha20KeyGeneratorTest.java	Fri Jun 01 17:45:10 2018 -0700
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2018, 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
+ * @bug 8153029
+ * @summary ChaCha20 key generator test.
+ * @library /test/lib
+ */
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.ChaCha20ParameterSpec;
+
+import jdk.test.lib.Utils;
+
+public class ChaCha20KeyGeneratorTest {
+
+    public static void main(String[] args) throws Exception {
+        KeyGenerator generator = KeyGenerator.getInstance("ChaCha20");
+
+        try {
+            generator.init(new ChaCha20ParameterSpec(
+                    Utils.toByteArray("100000000000000000000000"), 0));
+            throw new RuntimeException(
+                    "ChaCha20 key generation should not consume AlgorithmParameterSpec");
+        } catch (InvalidAlgorithmParameterException e) {
+            System.out.println("Expected InvalidAlgorithmParameterException: "
+                    + e.getMessage());
+        }
+
+        for (int keySize : new int[] { 32, 64, 128, 512, 1024 }) {
+            try {
+                generator.init(keySize);
+                throw new RuntimeException("The key size for ChaCha20 must be 256");
+            } catch (InvalidParameterException e) {
+                System.out.println(
+                        "Expected InvalidParameterException: " + keySize);
+            }
+        }
+
+        generator.init(256);
+        SecretKey key = generator.generateKey();
+        byte[] keyValue = key.getEncoded();
+        System.out.println("Key: " + Utils.toHexString(keyValue));
+        if (keyValue.length != 32) {
+            throw new RuntimeException("The size of generated key must be 256");
+        }
+    }
+}

--- a/test/lib/jdk/test/lib/Utils.java	Fri Jun 01 15:48:55 2018 -0700
+++ b/test/lib/jdk/test/lib/Utils.java	Fri Jun 01 17:45:10 2018 -0700
@@ -401,19 +401,35 @@
      * Returns hex view of byte array
      *
      * @param bytes byte array to process
-     * @return Space separated hexadecimal string representation of bytes
+     * @return space separated hexadecimal string representation of bytes
      */
+     public static String toHexString(byte[] bytes) {
+         char[] hexView = new char[bytes.length * 3 - 1];
+         for (int i = 0; i < bytes.length - 1; i++) {
+             hexView[i * 3] = hexArray[(bytes[i] >> 4) & 0x0F];
+             hexView[i * 3 + 1] = hexArray[bytes[i] & 0x0F];
+             hexView[i * 3 + 2] = ' ';
+         }
+         hexView[hexView.length - 2] = hexArray[(bytes[bytes.length - 1] >> 4) & 0x0F];
+         hexView[hexView.length - 1] = hexArray[bytes[bytes.length - 1] & 0x0F];
+         return new String(hexView);
+     }
 
-    public static String toHexString(byte[] bytes) {
-        char[] hexView = new char[bytes.length * 3];
-        int i = 0;
-        for (byte b : bytes) {
-            hexView[i++] = hexArray[(b >> 4) & 0x0F];
-            hexView[i++] = hexArray[b & 0x0F];
-            hexView[i++] = ' ';
-        }
-        return new String(hexView);
-    }
+     /**
+      * Returns byte array of hex view
+      *
+      * @param hex hexadecimal string representation
+      * @return byte array
+      */
+     public static byte[] toByteArray(String hex) {
+         int length = hex.length();
+         byte[] bytes = new byte[length / 2];
+         for (int i = 0; i < length; i += 2) {
+             bytes[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4)
+                     + Character.digit(hex.charAt(i + 1), 16));
+         }
+         return bytes;
+     }
 
     /**
      * Returns {@link java.util.Random} generator initialized with particular seed.
@@ -793,4 +809,3 @@
         return Files.createTempFile(dir, prefix, suffix);
     }
 }
-