fixed typo in sha2 names.

CBitLabs · Oct 1, 2015 · 647801a · 647801a
1 parent fe3ea73
commit 647801a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/core/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java b/core/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java
@@ -32,13 +32,13 @@ public interface NISTObjectIdentifiers
     static final ASN1ObjectIdentifier    id_sha512_256           = hashAlgs.branch("6");
 
     /** 2.16.840.1.101.3.4.2.7 */
-    static final ASN1ObjectIdentifier    id_sha3_sha224          = hashAlgs.branch("7");
+    static final ASN1ObjectIdentifier    id_sha3_224 = hashAlgs.branch("7");
     /** 2.16.840.1.101.3.4.2.8 */
-    static final ASN1ObjectIdentifier    id_sha3_sha256          = hashAlgs.branch("8");
+    static final ASN1ObjectIdentifier    id_sha3_256 = hashAlgs.branch("8");
     /** 2.16.840.1.101.3.4.2.9 */
-    static final ASN1ObjectIdentifier    id_sha3_sha384          = hashAlgs.branch("9");
+    static final ASN1ObjectIdentifier    id_sha3_384 = hashAlgs.branch("9");
     /** 2.16.840.1.101.3.4.2.10 */
-    static final ASN1ObjectIdentifier    id_sha3_sha512          = hashAlgs.branch("10");
+    static final ASN1ObjectIdentifier    id_sha3_512 = hashAlgs.branch("10");
     /** 2.16.840.1.101.3.4.2.11 */
     static final ASN1ObjectIdentifier    id_shake128             = hashAlgs.branch("11");
     /** 2.16.840.1.101.3.4.2.12 */

diff --git a/pkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java b/pkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java
@@ -69,10 +69,10 @@ public class DefaultDigestAlgorithmIdentifierFinder
         digestNameToOids.put("SHA384", NISTObjectIdentifiers.id_sha384);
         digestNameToOids.put("SHA512", NISTObjectIdentifiers.id_sha512);
 
-        digestNameToOids.put("SHA3-224", NISTObjectIdentifiers.id_sha3_sha224);
-        digestNameToOids.put("SHA3-256", NISTObjectIdentifiers.id_sha3_sha256);
-        digestNameToOids.put("SHA3-384", NISTObjectIdentifiers.id_sha3_sha384);
-        digestNameToOids.put("SHA3-512", NISTObjectIdentifiers.id_sha3_sha512);
+        digestNameToOids.put("SHA3-224", NISTObjectIdentifiers.id_sha3_224);
+        digestNameToOids.put("SHA3-256", NISTObjectIdentifiers.id_sha3_256);
+        digestNameToOids.put("SHA3-384", NISTObjectIdentifiers.id_sha3_384);
+        digestNameToOids.put("SHA3-512", NISTObjectIdentifiers.id_sha3_512);
 
         digestNameToOids.put("SHAKE-128", NISTObjectIdentifiers.id_shake128);
         digestNameToOids.put("SHAKE-256", NISTObjectIdentifiers.id_shake256);

diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java
@@ -81,10 +81,10 @@ public void configure(ConfigurableProvider provider)
             provider.addAlgorithm("MessageDigest.SHA3-256", PREFIX + "$Digest256");
             provider.addAlgorithm("MessageDigest.SHA3-384", PREFIX + "$Digest384");
             provider.addAlgorithm("MessageDigest.SHA3-512", PREFIX + "$Digest512");
-            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_sha224, PREFIX + "$Digest224");
-            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_sha256, PREFIX + "$Digest256");
-            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_sha384, PREFIX + "$Digest384");
-            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_sha512, PREFIX + "$Digest512");
+            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_224, PREFIX + "$Digest224");
+            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_256, PREFIX + "$Digest256");
+            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_384, PREFIX + "$Digest384");
+            provider.addAlgorithm("MessageDigest", NISTObjectIdentifiers.id_sha3_512, PREFIX + "$Digest512");
         }
     }
 }