--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2002-2005 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 6313675 6323647
+ * @summary Verify that all ciphersuites work in FIPS mode
+ * @author Andreas Sterbenz
+ * @library ..
+ */
+
+import java.security.*;
+
+// This test belongs more in JSSE than here, but the JSSE workspace does not
+// have the NSS test infrastructure. It will live here for the time being.
+
+public class ClientJSSEServerJSSE extends SecmodTest {
+
+    public static void main(String[] args) throws Exception {
+        if (initSecmod() == false) {
+            return;
+        }
+
+        if ("sparc".equals(System.getProperty("os.arch")) == false) {
+            // we have not updated other platforms with the proper NSS libraries yet
+            System.out.println("Test currently works only on solaris-sparc, skipping");
+            return;
+        }
+
+        String configName = BASE + SEP + "fips.cfg";
+        Provider p = getSunPKCS11(configName);
+
+        System.out.println(p);
+        Security.addProvider(p);
+
+        Security.removeProvider("SunJSSE");
+        Provider jsse = new com.sun.net.ssl.internal.ssl.Provider(p);
+        Security.addProvider(jsse);
+        System.out.println(jsse.getInfo());
+
+        KeyStore ks = KeyStore.getInstance("PKCS11", p);
+        ks.load(null, "test12".toCharArray());
+
+        CipherTest.main(new JSSEFactory(), ks, args);
+    }
+
+    private static class JSSEFactory extends CipherTest.PeerFactory {
+
+        String getName() {
+            return "Client JSSE - Server JSSE";
+        }
+
+        CipherTest.Client newClient(CipherTest cipherTest) throws Exception {
+            return new JSSEClient(cipherTest);
+        }
+
+        CipherTest.Server newServer(CipherTest cipherTest) throws Exception {
+            return new JSSEServer(cipherTest);
+        }
+    }
+}