# HG changeset patch
# User valeriep
# Date 1541552666 0
# Node ID 4ee78b5583f99a551bb171ad33d31de87f775266
# Parent  b64514ff68fd794e4464c764407a0dd206561855
8211049: Second parameter of "initialize" method is not used
Summary: Use the specified random object instead of system default
Reviewed-by: weijun

diff -r b64514ff68fd -r 4ee78b5583f9 src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
--- a/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java	Tue Nov 06 23:03:05 2018 +0100
+++ b/src/java.base/share/classes/sun/security/rsa/RSAKeyPairGenerator.java	Wed Nov 07 01:04:26 2018 +0000
@@ -70,7 +70,7 @@
     public void initialize(int keySize, SecureRandom random) {
         try {
             initialize(new RSAKeyGenParameterSpec(keySize,
-                    RSAKeyGenParameterSpec.F4), null);
+                    RSAKeyGenParameterSpec.F4), random);
         } catch (InvalidAlgorithmParameterException iape) {
             throw new InvalidParameterException(iape.getMessage());
         }
diff -r b64514ff68fd -r 4ee78b5583f9 test/jdk/sun/security/rsa/TestKeyPairGeneratorInit.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/rsa/TestKeyPairGeneratorInit.java	Wed Nov 07 01:04:26 2018 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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     8211049
+ * @summary make sure the supplied SecureRandom object is used
+ */
+
+import java.security.*;
+import java.security.interfaces.*;
+
+public class TestKeyPairGeneratorInit {
+
+    private static class MySecureRandom extends SecureRandom {
+        boolean isUsed = false;
+        public MySecureRandom() {
+            super();
+        }
+
+        public void nextBytes(byte[] bytes) {
+            isUsed = true;
+            super.nextBytes(bytes);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        KeyPairGenerator kpg =
+            KeyPairGenerator.getInstance("RSA", "SunRsaSign");
+        MySecureRandom rnd = new MySecureRandom();
+        kpg.initialize(2048, rnd);
+        System.out.println("Generate keypair then check");
+        KeyPair kp = kpg.generateKeyPair();
+        if (!rnd.isUsed) {
+            throw new RuntimeException("ERROR: Supplied random not used");
+        } else {
+            System.out.println("=> Test passed");
+        }
+    }
+}