# HG changeset patch
# User valeriep
# Date 1268960199 25200
# Node ID eccef47ec254b5ed3b7efe558a4e08278d6860d8
# Parent  bb63e4d4b1de35d0a4cb9446c398a3accb7e7a01
6837847: PKCS#11 A SecureRandom and a serialization error following installation of 1.5.0_18
Summary: Added a custom readObject method to PKCS11 SecureRandom impl
Reviewed-by: wetmore

diff -r bb63e4d4b1de -r eccef47ec254 jdk/src/share/classes/sun/security/pkcs11/P11SecureRandom.java
--- a/jdk/src/share/classes/sun/security/pkcs11/P11SecureRandom.java	Thu Mar 18 17:32:45 2010 -0700
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11SecureRandom.java	Thu Mar 18 17:56:39 2010 -0700
@@ -188,4 +188,13 @@
             token.releaseSession(session);
         }
     }
+
+    private void readObject(ObjectInputStream in)
+            throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        // assign default values to non-null transient fields
+        iBuffer = new byte[IBUFFER_SIZE];
+        ibuffered = 0;
+        lastRead = 0L;
+    }
 }
diff -r bb63e4d4b1de -r eccef47ec254 jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java	Thu Mar 18 17:56:39 2010 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6837847
+ * @summary Ensure a deserialized PKCS#11 SecureRandom is functional.
+ * @library ..
+ */
+
+import java.security.*;
+import java.io.*;
+
+public class TestDeserialization extends PKCS11Test {
+
+    public void main(Provider p) throws Exception {
+        // Skip this test for providers not found by java.security.Security
+        if (Security.getProvider(p.getName()) != p) {
+            System.out.println("Skip test for provider " + p.getName());
+            return;
+        }
+        SecureRandom r;
+        try {
+            r = SecureRandom.getInstance("PKCS11", p);
+            System.out.println("SecureRandom instance " + r);
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println("Provider " + p +
+                               " does not support SecureRandom, skipping");
+            e.printStackTrace();
+            return;
+        }
+        r.setSeed(System.currentTimeMillis());
+        byte[] buf = new byte[16];
+        byte[] ser = toByteArray(r);
+        System.out.println("Serialized Len = " + ser.length);
+        SecureRandom r2 = fromByteArray(ser);
+        System.out.println("Deserialized into " + r2);
+        r2.nextBytes(buf);
+        System.out.println("Done");
+    }
+
+    public static void main(String[] args) throws Exception {
+        main(new TestDeserialization());
+    }
+
+    private byte[] toByteArray(SecureRandom r) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+        ObjectOutputStream outStream = null;
+        try {
+            outStream = new ObjectOutputStream(out);
+            outStream.writeObject(r);
+            return out.toByteArray();
+        } finally {
+            if (outStream != null) {
+                outStream.close();
+            }
+        }
+    }
+
+    private SecureRandom fromByteArray(byte[] buf) throws Exception {
+        SecureRandom r = null;
+        ByteArrayInputStream is = new ByteArrayInputStream(buf);
+        ObjectInputStream ois = null;
+        try {
+            ois = new ObjectInputStream(is);
+            r = (SecureRandom) ois.readObject();
+        } finally {
+            if (ois != null) {
+                ois.close();
+            }
+        }
+        return r;
+    }
+}