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

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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.  Oracle designates this

@@ -68,11 +68,11 @@
  *
  * - Password-based Encryption (PBE)
  *
  * - Diffie-Hellman Key Agreement
  *
- * - HMAC-MD5, HMAC-SHA1, HMAC-SHA-256, HMAC-SHA-384, HMAC-SHA-512
+ * - HMAC-MD5, HMAC-SHA1, HMAC-SHA-224, HMAC-SHA-256, HMAC-SHA-384, HMAC-SHA-512
  *
  */
 
 public final class SunJCE extends Provider {
 

@@ -115,10 +115,11 @@
                 put("Cipher.RSA SupportedModes", "ECB");
                 put("Cipher.RSA SupportedPaddings",
                         "NOPADDING|PKCS1PADDING|OAEPWITHMD5ANDMGF1PADDING"
                         + "|OAEPWITHSHA1ANDMGF1PADDING"
                         + "|OAEPWITHSHA-1ANDMGF1PADDING"
+                        + "|OAEPWITHSHA-224ANDMGF1PADDING"
                         + "|OAEPWITHSHA-256ANDMGF1PADDING"
                         + "|OAEPWITHSHA-384ANDMGF1PADDING"
                         + "|OAEPWITHSHA-512ANDMGF1PADDING");
                 put("Cipher.RSA SupportedKeyClasses",
                         "java.security.interfaces.RSAPublicKey" +

@@ -223,16 +224,29 @@
                     "com.sun.crypto.provider.HmacMD5KeyGenerator");
 
                 put("KeyGenerator.HmacSHA1",
                     "com.sun.crypto.provider.HmacSHA1KeyGenerator");
 
+                put("KeyGenerator.HmacSHA224",
+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA2KG$SHA224");
+                put("Alg.Alias.KeyGenerator.OID.1.2.840.113549.2.8", "HmacSHA224");
+                put("Alg.Alias.KeyGenerator.1.2.840.113549.2.8", "HmacSHA224");
+
                 put("KeyGenerator.HmacSHA256",
-                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA256KG");
+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA2KG$SHA256");
+                put("Alg.Alias.KeyGenerator.OID.1.2.840.113549.2.9", "HmacSHA256");
+                put("Alg.Alias.KeyGenerator.1.2.840.113549.2.9", "HmacSHA256");
+
                 put("KeyGenerator.HmacSHA384",
-                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA384KG");
+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA2KG$SHA384");
+                put("Alg.Alias.KeyGenerator.OID.1.2.840.113549.2.10", "HmacSHA384");
+                put("Alg.Alias.KeyGenerator.1.2.840.113549.2.10", "HmacSHA384");
+
                 put("KeyGenerator.HmacSHA512",
-                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA512KG");
+                    "com.sun.crypto.provider.KeyGeneratorCore$HmacSHA2KG$SHA512");
+                put("Alg.Alias.KeyGenerator.OID.1.2.840.113549.2.11", "HmacSHA512");
+                put("Alg.Alias.KeyGenerator.1.2.840.113549.2.11", "HmacSHA512");
 
                 put("KeyPairGenerator.DiffieHellman",
                     "com.sun.crypto.provider.DHKeyPairGenerator");
                 put("Alg.Alias.KeyPairGenerator.DH", "DiffieHellman");
                 put("Alg.Alias.KeyPairGenerator.OID."+OID_PKCS3,

@@ -391,26 +405,38 @@
                 /*
                  * MAC
                  */
                 put("Mac.HmacMD5", "com.sun.crypto.provider.HmacMD5");
                 put("Mac.HmacSHA1", "com.sun.crypto.provider.HmacSHA1");
+                put("Mac.HmacSHA224",
+                    "com.sun.crypto.provider.HmacCore$HmacSHA224");
+                put("Alg.Alias.Mac.OID.1.2.840.113549.2.8", "HmacSHA224");
+                put("Alg.Alias.Mac.1.2.840.113549.2.8", "HmacSHA224");
                 put("Mac.HmacSHA256",
                     "com.sun.crypto.provider.HmacCore$HmacSHA256");
+                put("Alg.Alias.Mac.OID.1.2.840.113549.2.9", "HmacSHA256");
+                put("Alg.Alias.Mac.1.2.840.113549.2.9", "HmacSHA256");
                 put("Mac.HmacSHA384",
                     "com.sun.crypto.provider.HmacCore$HmacSHA384");
+                put("Alg.Alias.Mac.OID.1.2.840.113549.2.10", "HmacSHA384");
+                put("Alg.Alias.Mac.1.2.840.113549.2.10", "HmacSHA384");
                 put("Mac.HmacSHA512",
                     "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");
 
                 put("Mac.SslMacMD5",
                     "com.sun.crypto.provider.SslMacCore$SslMacMD5");
                 put("Mac.SslMacSHA1",
                     "com.sun.crypto.provider.SslMacCore$SslMacSHA1");
 
                 put("Mac.HmacMD5 SupportedKeyFormats", "RAW");
                 put("Mac.HmacSHA1 SupportedKeyFormats", "RAW");
+                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.SslMacMD5 SupportedKeyFormats", "RAW");