--- /dev/null	2018-05-11 10:42:23.849000000 -0700
+++ new/test/jdk/sun/security/rsa/pss/TestPSSKeySupport.java	2018-05-11 15:11:00.852379100 -0700
@@ -0,0 +1,152 @@
+/*
+ * 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 8146293 
+ * @summary Test RSASSA-PSS Key related support such as KeyPairGenerator
+ * and KeyFactory of the SunRsaSign provider
+ */
+
+import java.io.*;
+import java.util.*;
+import java.math.BigInteger;
+
+import java.security.*;
+import java.security.interfaces.*;
+import java.security.spec.*;
+
+public class TestPSSKeySupport {
+
+    private static final String ALGO = "RSASSA-PSS";
+
+    /**
+     * Test that key1 (reference key) and key2 (key to be tested) are
+     * equivalent
+     */
+    private static void testKey(Key key1, Key key2) throws Exception {
+        if (key2.getAlgorithm().equals(ALGO) == false) {
+            throw new Exception("Algorithm not " + ALGO);
+        }
+        if (key1 instanceof PublicKey) {
+            if (key2.getFormat().equals("X.509") == false) {
+                throw new Exception("Format not X.509");
+            }
+        } else if (key1 instanceof PrivateKey) {
+            if (key2.getFormat().equals("PKCS#8") == false) {
+                throw new Exception("Format not PKCS#8");
+            }
+        }
+        if (key1.equals(key2) == false) {
+            throw new Exception("Keys not equal");
+        }
+        if (Arrays.equals(key1.getEncoded(), key2.getEncoded()) == false) {
+            throw new Exception("Encodings not equal");
+        }
+    }
+
+    private static void testPublic(KeyFactory kf, PublicKey key) throws Exception {
+        System.out.println("Testing public key...");
+        PublicKey key2 = (PublicKey)kf.translateKey(key);
+        KeySpec rsaSpec = kf.getKeySpec(key, RSAPublicKeySpec.class);
+        PublicKey key3 = kf.generatePublic(rsaSpec);
+        KeySpec x509Spec = kf.getKeySpec(key, X509EncodedKeySpec.class);
+        PublicKey key4 = kf.generatePublic(x509Spec);
+        KeySpec x509Spec2 = new X509EncodedKeySpec(key.getEncoded());
+        PublicKey key5 = kf.generatePublic(x509Spec2);
+        testKey(key, key);
+        testKey(key, key2);
+        testKey(key, key3);
+        testKey(key, key4);
+        testKey(key, key5);
+    }
+
+    private static void testPrivate(KeyFactory kf, PrivateKey key) throws Exception {
+        System.out.println("Testing private key...");
+        PrivateKey key2 = (PrivateKey)kf.translateKey(key);
+        KeySpec rsaSpec = kf.getKeySpec(key, RSAPrivateCrtKeySpec.class);
+        PrivateKey key3 = kf.generatePrivate(rsaSpec);
+        KeySpec pkcs8Spec = kf.getKeySpec(key, PKCS8EncodedKeySpec.class);
+        PrivateKey key4 = kf.generatePrivate(pkcs8Spec);
+        KeySpec pkcs8Spec2 = new PKCS8EncodedKeySpec(key.getEncoded());
+        PrivateKey key5 = kf.generatePrivate(pkcs8Spec2);
+        testKey(key, key);
+        testKey(key, key2);
+        testKey(key, key3);
+        testKey(key, key4);
+        testKey(key, key5);
+
+        KeySpec rsaSpec2 = kf.getKeySpec(key, RSAPrivateKeySpec.class);
+        PrivateKey key6 = kf.generatePrivate(rsaSpec2);
+        RSAPrivateKey rsaKey = (RSAPrivateKey)key;
+        KeySpec rsaSpec3 = new RSAPrivateKeySpec(rsaKey.getModulus(),
+            rsaKey.getPrivateExponent(), rsaKey.getParams());
+        PrivateKey key7 = kf.generatePrivate(rsaSpec3);
+        testKey(key6, key6);
+        testKey(key6, key7);
+    }
+
+    private static void test(KeyFactory kf, Key key) throws Exception {
+        if (key.getAlgorithm().equals(ALGO) == false) {
+            throw new Exception("Error: key algo should be " + ALGO);
+        }
+        if (key instanceof PublicKey) {
+            testPublic(kf, (PublicKey)key);
+        } else if (key instanceof PrivateKey) {
+            testPrivate(kf, (PrivateKey)key);
+        }
+    }
+
+    private static void checkKeyPair(KeyPair kp) throws Exception {
+        PublicKey pubKey = kp.getPublic();
+        if (!(pubKey instanceof RSAPublicKey)) {
+            throw new Exception("Error: public key should be RSAPublicKey");
+        }
+        PrivateKey privKey = kp.getPrivate();
+        if (!(privKey instanceof RSAPrivateKey)) {
+            throw new Exception("Error: private key should be RSAPrivateKey");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        KeyPairGenerator kpg =
+            KeyPairGenerator.getInstance(ALGO, "SunRsaSign");
+ 
+        // Algorithm-Independent Initialization
+        kpg.initialize(2048);
+        KeyPair kp = kpg.generateKeyPair();
+        checkKeyPair(kp);
+        BigInteger pubExp = ((RSAPublicKey)kp.getPublic()).getPublicExponent();
+
+        // Algorithm-specific Initialization
+        PSSParameterSpec params = new PSSParameterSpec("SHA-256", "MGF1", 
+            MGF1ParameterSpec.SHA256, 32, 1);
+        kpg.initialize(new RSAKeyGenParameterSpec(2048, pubExp, params));
+        KeyPair kp2 = kpg.generateKeyPair();
+        checkKeyPair(kp2);
+
+        KeyFactory kf = KeyFactory.getInstance(ALGO, "SunRsaSign");
+        test(kf, kp.getPublic());
+        test(kf, kp.getPrivate());
+    }
+}