--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/pkcs12/StorePasswordTest.java	Wed Jan 23 23:13:54 2013 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2013, 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 8005408
+ * @summary KeyStore API enhancements
+ */
+
+import java.io.*;
+import java.security.*;
+import java.util.*;
+import javax.crypto.*;
+import javax.crypto.spec.*;
+import java.security.spec.InvalidKeySpecException;
+
+// Store a password in a keystore and retrieve it again.
+
+public class StorePasswordTest {
+    private final static String DIR = System.getProperty("test.src", ".");
+    private static final char[] PASSWORD = "passphrase".toCharArray();
+    private static final String KEYSTORE = "pwdstore.p12";
+    private static final String ALIAS = "my password";
+    private static final String USER_PASSWORD = "hello1";
+
+    public static void main(String[] args) throws Exception {
+
+        new File(KEYSTORE).delete();
+
+        try {
+
+            KeyStore keystore = KeyStore.getInstance("PKCS12");
+            keystore.load(null, null);
+
+            // Set entry
+            keystore.setEntry(ALIAS,
+                new KeyStore.SecretKeyEntry(convertPassword(USER_PASSWORD)),
+                    new KeyStore.PasswordProtection(PASSWORD));
+
+            System.out.println("Storing keystore to: " + KEYSTORE);
+            keystore.store(new FileOutputStream(KEYSTORE), PASSWORD);
+
+            System.out.println("Loading keystore from: " + KEYSTORE);
+            keystore.load(new FileInputStream(KEYSTORE), PASSWORD);
+            System.out.println("Loaded keystore with " + keystore.size() +
+                " entries");
+            KeyStore.Entry entry = keystore.getEntry(ALIAS,
+                new KeyStore.PasswordProtection(PASSWORD));
+            System.out.println("Retrieved entry: " + entry);
+
+            SecretKey key = (SecretKey) keystore.getKey(ALIAS, PASSWORD);
+            SecretKeyFactory factory =
+                SecretKeyFactory.getInstance(key.getAlgorithm());
+            PBEKeySpec keySpec =
+                (PBEKeySpec) factory.getKeySpec(key, PBEKeySpec.class);
+            char[] pwd = keySpec.getPassword();
+            System.out.println("Recovered credential: " + new String(pwd));
+
+            if (!Arrays.equals(USER_PASSWORD.toCharArray(), pwd)) {
+                throw new Exception("Failed to recover the stored password");
+            }
+        } finally {
+            new File(KEYSTORE).delete();
+        }
+    }
+
+    private static SecretKey convertPassword(String password)
+        throws NoSuchAlgorithmException, InvalidKeySpecException {
+        SecretKeyFactory factory = SecretKeyFactory.getInstance("PBE");
+        return factory.generateSecret(new PBEKeySpec(password.toCharArray()));
+    }
+}