RH2134669: Add missing attributes when registering services in FIPS mode.

Backport-Of: 7aaa009fd949b22d8be068b1df6733330a60f85c

Author: martinuy

src/java.base/share/classes/sun/security/provider/SunEntries.java

@@ -174,14 +174,16 @@ public static List<String> createAliasesWithOid(String ... oids) {
             add(p, "Signature", "SHA256withDSAinP1363Format",
                     "sun.security.provider.DSA$SHA256withDSAinP1363Format",
                     null, null);
+        }
 
-            /*
-             *  Key Pair Generator engines
-             */
-            attrs.clear();
-            attrs.put("ImplementedIn", "Software");
-            attrs.put("KeySize", "2048"); // for DSA KPG and APG only
+        /*
+         *  Key Pair Generator engines
+         */
+        attrs.clear();
+        attrs.put("ImplementedIn", "Software");
+        attrs.put("KeySize", "2048"); // for DSA KPG and APG only
 
+        if (!systemFipsEnabled) {
             String dsaKPGImplClass = "sun.security.provider.DSAKeyPairGenerator$";
             dsaKPGImplClass += (useLegacyDSA? "Legacy" : "Current");
             add(p, "KeyPairGenerator", "DSA", dsaKPGImplClass, dsaAliases, attrs);

src/java.base/share/classes/sun/security/rsa/SunRsaSignEntries.java

@@ -61,11 +61,9 @@ public SunRsaSignEntries(Provider p) {
 
         // common attribute map
         HashMap<String, String> attrs = new HashMap<>(3);
-        if (!systemFipsEnabled) {
-            attrs.put("SupportedKeyClasses",
-                    "java.security.interfaces.RSAPublicKey" +
-                    "|java.security.interfaces.RSAPrivateKey");
-        }
+        attrs.put("SupportedKeyClasses",
+                "java.security.interfaces.RSAPublicKey" +
+                "|java.security.interfaces.RSAPrivateKey");
 
         add(p, "KeyFactory", "RSA",
                 "sun.security.rsa.RSAKeyFactory$Legacy",