src/share/classes/com/sun/crypto/provider/SunJCE.java

@@ -705,11 +705,23 @@
                         "com.sun.crypto.provider.HmacCore$HmacSHA512");
                     put("Alg.Alias.Mac.OID.1.2.840.113549.2.11", "HmacSHA512");
                     put("Alg.Alias.Mac.1.2.840.113549.2.11", "HmacSHA512");
 
                     put("Mac.HmacPBESHA1",
-                        "com.sun.crypto.provider.HmacPKCS12PBESHA1");
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA1");
+                    put("Mac.HmacPBESHA224",
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA224");
+                    put("Mac.HmacPBESHA256",
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA256");
+                    put("Mac.HmacPBESHA384",
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA384");
+                    put("Mac.HmacPBESHA512",
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512");
+                    put("Mac.HmacPBESHA512/224",
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_224");
+                    put("Mac.HmacPBESHA512/256",
+                        "com.sun.crypto.provider.HmacPKCS12PBECore$HmacPKCS12PBE_SHA512_256");
 
                     // PBMAC1
 
                     put("Mac.PBEWithHmacSHA1",
                         "com.sun.crypto.provider.PBMAC1Core$HmacSHA1");

@@ -732,10 +744,16 @@
                     put("Mac.HmacSHA224 SupportedKeyFormats", "RAW");
                     put("Mac.HmacSHA256 SupportedKeyFormats", "RAW");
                     put("Mac.HmacSHA384 SupportedKeyFormats", "RAW");
                     put("Mac.HmacSHA512 SupportedKeyFormats", "RAW");
                     put("Mac.HmacPBESHA1 SupportedKeyFormats", "RAW");
+                    put("Mac.HmacPBESHA224 SupportedKeyFormats", "RAW");
+                    put("Mac.HmacPBESHA256 SupportedKeyFormats", "RAW");
+                    put("Mac.HmacPBESHA384 SupportedKeyFormats", "RAW");
+                    put("Mac.HmacPBESHA512 SupportedKeyFormats", "RAW");
+                    put("Mac.HmacPBESHA512/224 SupportedKeyFormats", "RAW");
+                    put("Mac.HmacPBESHA512/256 SupportedKeyFormats", "RAW");
                     put("Mac.PBEWithHmacSHA1 SupportedKeyFormatS", "RAW");
                     put("Mac.PBEWithHmacSHA224 SupportedKeyFormats", "RAW");
                     put("Mac.PBEWithHmacSHA256 SupportedKeyFormats", "RAW");
                     put("Mac.PBEWithHmacSHA384 SupportedKeyFormats", "RAW");
                     put("Mac.PBEWithHmacSHA512 SupportedKeyFormats", "RAW");