Merge pull request #170 from cconlon/shaOids

Additional JCE MessageDigest OID values for SHA-224/256/384/512

Author: rlm2002

README_JCE.md

@@ -89,9 +89,13 @@ The JCE provider currently supports the following algorithms:
         MD5
         SHA-1
         SHA-224
+            OID: 2.16.840.1.101.3.4.2.4
         SHA-256
+            OID: 2.16.840.1.101.3.4.2.1
         SHA-384
+            OID: 2.16.840.1.101.3.4.2.2
         SHA-512
+            OID: 2.16.840.1.101.3.4.2.3
         SHA3-224
         SHA3-256
         SHA3-384

src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java

@@ -86,18 +86,30 @@ private void registerServices() {
         if (FeatureDetect.Sha224Enabled()) {
             put("MessageDigest.SHA-224",
                     "com.wolfssl.provider.jce.WolfCryptMessageDigestSha224");
+            /* SHA-224 OID */
+            put("Alg.Alias.MessageDigest.2.16.840.1.101.3.4.2.4",
+                    "SHA-224");
         }
         if (FeatureDetect.Sha256Enabled()) {
             put("MessageDigest.SHA-256",
                     "com.wolfssl.provider.jce.WolfCryptMessageDigestSha256");
+            /* SHA-256 OID */
+            put("Alg.Alias.MessageDigest.2.16.840.1.101.3.4.2.1",
+                    "SHA-256");
         }
         if (FeatureDetect.Sha384Enabled()) {
             put("MessageDigest.SHA-384",
                     "com.wolfssl.provider.jce.WolfCryptMessageDigestSha384");
+            /* SHA-384 OID */
+            put("Alg.Alias.MessageDigest.2.16.840.1.101.3.4.2.2",
+                    "SHA-384");
         }
         if (FeatureDetect.Sha512Enabled()) {
             put("MessageDigest.SHA-512",
                     "com.wolfssl.provider.jce.WolfCryptMessageDigestSha512");
+            /* SHA-512 OID */
+            put("Alg.Alias.MessageDigest.2.16.840.1.101.3.4.2.3",
+                    "SHA-512");
         }
         if (FeatureDetect.Sha3Enabled()) {
             put("MessageDigest.SHA3-224",

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha224Test.java

@@ -254,4 +254,31 @@ public void testSha224GetDigestLength()
         MessageDigest sha224 = MessageDigest.getInstance("SHA-224", "wolfJCE");
         assertEquals(Sha224.DIGEST_SIZE, sha224.getDigestLength());
     }
+
+    @Test
+    public void testSha224OidAlias()
+        throws NoSuchProviderException, NoSuchAlgorithmException {
+
+        byte[] input = "1234567890".getBytes();
+
+        /* Get MessageDigest using algorithm name */
+        MessageDigest mdAlgorithm = MessageDigest.getInstance(
+            "SHA-224", "wolfJCE");
+        assertNotNull(mdAlgorithm);
+
+        /* Get MessageDigest using OID */
+        MessageDigest mdOid = MessageDigest.getInstance(
+            "2.16.840.1.101.3.4.2.4", "wolfJCE");
+        assertNotNull(mdOid);
+
+        /* Verify algorithm name matches */
+        assertEquals("SHA-224", mdAlgorithm.getAlgorithm());
+
+        /* Compute digests */
+        mdAlgorithm.update(input);
+        mdOid.update(input);
+
+        /* Verify digests match */
+        assertTrue(Arrays.equals(mdAlgorithm.digest(), mdOid.digest()));
+    }
 } 

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha256Test.java

@@ -395,5 +395,32 @@ public void testUpdateWithOffsetEqualToArraySizeThrows()
         /* Test with offset equal to array size */
         sha256.update(data, 10, 1);
     }
+
+    @Test
+    public void testSha256OidAlias()
+        throws NoSuchProviderException, NoSuchAlgorithmException {
+
+        byte[] input = "1234567890".getBytes();
+
+        /* Get MessageDigest using algorithm name */
+        MessageDigest mdAlgorithm = MessageDigest.getInstance(
+            "SHA-256", "wolfJCE");
+        assertNotNull(mdAlgorithm);
+
+        /* Get MessageDigest using OID */
+        MessageDigest mdOid = MessageDigest.getInstance(
+            "2.16.840.1.101.3.4.2.1", "wolfJCE");
+        assertNotNull(mdOid);
+
+        /* Verify algorithm name matches */
+        assertEquals("SHA-256", mdAlgorithm.getAlgorithm());
+
+        /* Compute digests */
+        mdAlgorithm.update(input);
+        mdOid.update(input);
+
+        /* Verify digests match */
+        assertTrue(Arrays.equals(mdAlgorithm.digest(), mdOid.digest()));
+    }
 }
 

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha384Test.java

@@ -370,5 +370,32 @@ public void testSha384Threaded()
             }
         }
     }
+
+    @Test
+    public void testSha384OidAlias()
+        throws NoSuchProviderException, NoSuchAlgorithmException {
+
+        byte[] input = "1234567890".getBytes();
+
+        /* Get MessageDigest using algorithm name */
+        MessageDigest mdAlgorithm = MessageDigest.getInstance(
+            "SHA-384", "wolfJCE");
+        assertNotNull(mdAlgorithm);
+
+        /* Get MessageDigest using OID */
+        MessageDigest mdOid = MessageDigest.getInstance(
+            "2.16.840.1.101.3.4.2.2", "wolfJCE");
+        assertNotNull(mdOid);
+
+        /* Verify algorithm name matches */
+        assertEquals("SHA-384", mdAlgorithm.getAlgorithm());
+
+        /* Compute digests */
+        mdAlgorithm.update(input);
+        mdOid.update(input);
+
+        /* Verify digests match */
+        assertTrue(Arrays.equals(mdAlgorithm.digest(), mdOid.digest()));
+    }
 }
 

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha512Test.java

@@ -390,5 +390,32 @@ public void testSha512Threaded()
             }
         }
     }
+
+    @Test
+    public void testSha512OidAlias()
+        throws NoSuchProviderException, NoSuchAlgorithmException {
+
+        byte[] input = "1234567890".getBytes();
+
+        /* Get MessageDigest using algorithm name */
+        MessageDigest mdAlgorithm = MessageDigest.getInstance(
+            "SHA-512", "wolfJCE");
+        assertNotNull(mdAlgorithm);
+
+        /* Get MessageDigest using OID */
+        MessageDigest mdOid = MessageDigest.getInstance(
+            "2.16.840.1.101.3.4.2.3", "wolfJCE");
+        assertNotNull(mdOid);
+
+        /* Verify algorithm name matches */
+        assertEquals("SHA-512", mdAlgorithm.getAlgorithm());
+
+        /* Compute digests */
+        mdAlgorithm.update(input);
+        mdOid.update(input);
+
+        /* Verify digests match */
+        assertTrue(Arrays.equals(mdAlgorithm.digest(), mdOid.digest()));
+    }
 }