changeset 14408:07b7895425c8

8154523: SHA1PRNG output should change after setSeed Reviewed-by: xuelei
author weijun
date Wed, 11 May 2016 12:32:00 +0800
parents d0c319c32334
children 5c8065ff20dd
files src/java.base/share/classes/sun/security/provider/SecureRandom.java test/sun/security/provider/SecureRandom/SHA1PRNGReseed.java
diffstat 2 files changed, 56 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/sun/security/provider/SecureRandom.java	Tue May 10 21:19:25 2016 -0700
+++ b/src/java.base/share/classes/sun/security/provider/SecureRandom.java	Wed May 11 12:32:00 2016 +0800
@@ -156,6 +156,7 @@
             }
         }
         state = digest.digest(seed);
+        remCount = 0;
     }
 
     private static void updateState(byte[] state, byte[] output) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/provider/SecureRandom/SHA1PRNGReseed.java	Wed May 11 12:32:00 2016 +0800
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, 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.
+ */
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.security.SecureRandom;
+
+/**
+ * @test
+ * @bug 8154523
+ * @summary SHA1PRNG output should change after setSeed
+ */
+public class SHA1PRNGReseed {
+
+    public static void main(String[] args) throws Exception {
+        SecureRandom sr = SecureRandom.getInstance("SHA1PRNG");
+        sr.setSeed(0);
+        sr.nextInt();
+
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        new ObjectOutputStream(bout).writeObject(sr);
+
+        SecureRandom sr2 = (SecureRandom) new ObjectInputStream(
+                new ByteArrayInputStream(bout.toByteArray())).readObject();
+
+        int i1 = sr.nextInt();
+        sr2.setSeed(1);
+        int i2 = sr2.nextInt();
+
+        if (i1 == i2) {
+            throw new Exception("output should not be the same");
+        }
+    }
+}