--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/rsa/pss/PSSParametersTest.java	Fri May 11 15:53:12 2018 -0700
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.*;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+import static javax.crypto.Cipher.PRIVATE_KEY;
+import static javax.crypto.Cipher.PUBLIC_KEY;
+
+/**
+ * @test
+ * @bug 8146293
+ * @summary Test RSASSA-PSS AlgorithmParameters impl of SunRsaSign provider.
+ * @run main PSSParametersTest
+ */
+public class PSSParametersTest {
+    /**
+     * JDK default RSA Provider.
+     */
+    private static final String PROVIDER = "SunRsaSign";
+
+    private static final String ALGO = "RSASSA-PSS";
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("Testing against DEFAULT parameters");
+        test(PSSParameterSpec.DEFAULT);
+        System.out.println("Testing against custom parameters");
+        test(new PSSParameterSpec("SHA-512/224", "MGF1", MGF1ParameterSpec.SHA384,
+            100, 1));
+        System.out.println("Test Passed");
+    }
+
+    // test against the given spec by initializing w/ it, generate the DER bytes,
+    // then initialize another instance w/ the DER bytes, retrieve the spec.
+    // compare both spec for equality and throw exception if the comparison failed.
+    private static void test(PSSParameterSpec spec) throws Exception {
+        AlgorithmParameters params = AlgorithmParameters.getInstance(ALGO, PROVIDER);
+        params.init(spec);
+        byte[] encoded = params.getEncoded();
+        AlgorithmParameters params2 = AlgorithmParameters.getInstance(ALGO, PROVIDER);
+        params2.init(encoded);
+        PSSParameterSpec spec2 = params2.getParameterSpec(PSSParameterSpec.class);
+        if (!isEqual(spec, spec2)) {
+            throw new RuntimeException("Spec check Failed");
+        }
+    }
+
+    private static boolean isEqual(PSSParameterSpec spec, PSSParameterSpec spec2)
+        throws Exception {
+        if (spec == spec2) return true;
+        if (spec == null || spec2 == null) return false;
+
+        if (!spec.getDigestAlgorithm().equals(spec2.getDigestAlgorithm())) {
+            System.out.println("Different digest algorithms: " +
+                spec.getDigestAlgorithm() + " vs " + spec2.getDigestAlgorithm());
+            return false;
+        }
+        if (!spec.getMGFAlgorithm().equals(spec2.getMGFAlgorithm())) {
+            System.out.println("Different MGF algorithms: " +
+                spec.getMGFAlgorithm() + " vs " + spec2.getMGFAlgorithm());
+            return false;
+        }
+        if (spec.getSaltLength() != spec2.getSaltLength()) {
+            System.out.println("Different Salt Length: " +
+                spec.getSaltLength() + " vs " + spec2.getSaltLength());
+            return false;
+        }
+        if (spec.getTrailerField() != spec2.getTrailerField()) {
+            System.out.println("Different TrailerField: " +
+                spec.getTrailerField() + " vs " + spec2.getTrailerField());
+            return false;
+        }
+        // continue checking MGF Parameters
+        AlgorithmParameterSpec mgfParams = spec.getMGFParameters();
+        AlgorithmParameterSpec mgfParams2 = spec2.getMGFParameters();
+        if (mgfParams == mgfParams2) return true;
+        if (mgfParams == null || mgfParams2 == null) {
+            System.out.println("Different MGF Parameters: " +
+                mgfParams + " vs " + mgfParams2);
+            return false;
+        }
+        if (mgfParams instanceof MGF1ParameterSpec) {
+            if (mgfParams2 instanceof MGF1ParameterSpec) {
+                boolean result =
+                    ((MGF1ParameterSpec)mgfParams).getDigestAlgorithm().equals
+                         (((MGF1ParameterSpec)mgfParams2).getDigestAlgorithm());
+                if (!result) {
+                    System.out.println("Different Digest algo in MGF Parameters: " +
+                        ((MGF1ParameterSpec)mgfParams).getDigestAlgorithm() + " vs " +
+                        ((MGF1ParameterSpec)mgfParams2).getDigestAlgorithm());
+                }
+                return result;
+            } else {
+                System.out.println("Different MGF Parameters types: " +
+                    mgfParams.getClass() + " vs " + mgfParams2.getClass());
+                return false;
+            }
+        }
+        throw new RuntimeException("Unrecognized MGFParameters: " + mgfParams);
+    }
+}