Generics migration complete

1 files changed, 176 insertions, 197 deletions

diff --git a/crypto/src/security/DigestUtilities.cs b/crypto/src/security/DigestUtilities.cs
index c67dd8b72..2c9e89277 100644
--- a/crypto/src/security/DigestUtilities.cs
+++ b/crypto/src/security/DigestUtilities.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.CryptoPro;
@@ -11,17 +11,17 @@ using Org.BouncyCastle.Asn1.Oiw;
 using Org.BouncyCastle.Asn1.Rosstandart;
 using Org.BouncyCastle.Asn1.TeleTrust;
 using Org.BouncyCastle.Asn1.UA;
-using Org.BouncyCastle.Security;
-using Org.BouncyCastle.Crypto.Digests;
 using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Digests;
 using Org.BouncyCastle.Utilities;
+using Org.BouncyCastle.Utilities.Collections;
 
 namespace Org.BouncyCastle.Security
 {
     /// <remarks>
     ///  Utility class for creating IDigest objects from their names/Oids
     /// </remarks>
-    public sealed class DigestUtilities
+    public static class DigestUtilities
     {
         private enum DigestAlgorithm {
             BLAKE2B_160, BLAKE2B_256, BLAKE2B_384, BLAKE2B_512,
@@ -42,130 +42,128 @@ namespace Org.BouncyCastle.Security
             WHIRLPOOL,
         };
 
-        private DigestUtilities()
-        {
-        }
-
-        private static readonly IDictionary algorithms = Platform.CreateHashtable();
-        private static readonly IDictionary oids = Platform.CreateHashtable();
+        private static readonly IDictionary<string, string> Aliases =
+            new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        private static readonly IDictionary<string, DerObjectIdentifier> Oids =
+            new Dictionary<string, DerObjectIdentifier>(StringComparer.OrdinalIgnoreCase);
 
         static DigestUtilities()
         {
             // Signal to obfuscation tools not to change enum constants
             ((DigestAlgorithm)Enums.GetArbitraryValue(typeof(DigestAlgorithm))).ToString();
 
-            algorithms[PkcsObjectIdentifiers.MD2.Id] = "MD2";
-            algorithms[PkcsObjectIdentifiers.MD4.Id] = "MD4";
-            algorithms[PkcsObjectIdentifiers.MD5.Id] = "MD5";
-
-            algorithms["SHA1"] = "SHA-1";
-            algorithms[OiwObjectIdentifiers.IdSha1.Id] = "SHA-1";
-            algorithms[PkcsObjectIdentifiers.IdHmacWithSha1.Id] = "SHA-1";
-            algorithms[MiscObjectIdentifiers.HMAC_SHA1.Id] = "SHA-1";
-            algorithms["SHA224"] = "SHA-224";
-            algorithms[NistObjectIdentifiers.IdSha224.Id] = "SHA-224";
-            algorithms[PkcsObjectIdentifiers.IdHmacWithSha224.Id] = "SHA-224";
-            algorithms["SHA256"] = "SHA-256";
-            algorithms[NistObjectIdentifiers.IdSha256.Id] = "SHA-256";
-            algorithms[PkcsObjectIdentifiers.IdHmacWithSha256.Id] = "SHA-256";
-            algorithms["SHA384"] = "SHA-384";
-            algorithms[NistObjectIdentifiers.IdSha384.Id] = "SHA-384";
-            algorithms[PkcsObjectIdentifiers.IdHmacWithSha384.Id] = "SHA-384";
-            algorithms["SHA512"] = "SHA-512";
-            algorithms[NistObjectIdentifiers.IdSha512.Id] = "SHA-512";
-            algorithms[PkcsObjectIdentifiers.IdHmacWithSha512.Id] = "SHA-512";
-
-            algorithms["SHA512/224"] = "SHA-512/224";
-            algorithms["SHA512(224)"] = "SHA-512/224";
-            algorithms["SHA-512(224)"] = "SHA-512/224";
-            algorithms[NistObjectIdentifiers.IdSha512_224.Id] = "SHA-512/224";
-            algorithms["SHA512/256"] = "SHA-512/256";
-            algorithms["SHA512(256)"] = "SHA-512/256";
-            algorithms["SHA-512(256)"] = "SHA-512/256";
-            algorithms[NistObjectIdentifiers.IdSha512_256.Id] = "SHA-512/256";
-
-            algorithms["RIPEMD-128"] = "RIPEMD128";
-            algorithms[TeleTrusTObjectIdentifiers.RipeMD128.Id] = "RIPEMD128";
-            algorithms["RIPEMD-160"] = "RIPEMD160";
-            algorithms[TeleTrusTObjectIdentifiers.RipeMD160.Id] = "RIPEMD160";
-            algorithms["RIPEMD-256"] = "RIPEMD256";
-            algorithms[TeleTrusTObjectIdentifiers.RipeMD256.Id] = "RIPEMD256";
-            algorithms["RIPEMD-320"] = "RIPEMD320";
-//			algorithms[TeleTrusTObjectIdentifiers.RipeMD320.Id] = "RIPEMD320";
-
-            algorithms[CryptoProObjectIdentifiers.GostR3411.Id] = "GOST3411";
-
-            algorithms["KECCAK224"] = "KECCAK-224";
-            algorithms["KECCAK256"] = "KECCAK-256";
-            algorithms["KECCAK288"] = "KECCAK-288";
-            algorithms["KECCAK384"] = "KECCAK-384";
-            algorithms["KECCAK512"] = "KECCAK-512";
-
-            algorithms[NistObjectIdentifiers.IdSha3_224.Id] = "SHA3-224";
-            algorithms[NistObjectIdentifiers.IdHMacWithSha3_224.Id] = "SHA3-224";
-            algorithms[NistObjectIdentifiers.IdSha3_256.Id] = "SHA3-256";
-            algorithms[NistObjectIdentifiers.IdHMacWithSha3_256.Id] = "SHA3-256";
-            algorithms[NistObjectIdentifiers.IdSha3_384.Id] = "SHA3-384";
-            algorithms[NistObjectIdentifiers.IdHMacWithSha3_384.Id] = "SHA3-384";
-            algorithms[NistObjectIdentifiers.IdSha3_512.Id] = "SHA3-512";
-            algorithms[NistObjectIdentifiers.IdHMacWithSha3_512.Id] = "SHA3-512";
-            algorithms["SHAKE128"] = "SHAKE128-256";
-            algorithms[NistObjectIdentifiers.IdShake128.Id] = "SHAKE128-256";
-            algorithms["SHAKE256"] = "SHAKE256-512";
-            algorithms[NistObjectIdentifiers.IdShake256.Id] = "SHAKE256-512";
-
-            algorithms[GMObjectIdentifiers.sm3.Id] = "SM3";
-
-            algorithms[MiscObjectIdentifiers.id_blake2b160.Id] = "BLAKE2B-160";
-            algorithms[MiscObjectIdentifiers.id_blake2b256.Id] = "BLAKE2B-256";
-            algorithms[MiscObjectIdentifiers.id_blake2b384.Id] = "BLAKE2B-384";
-            algorithms[MiscObjectIdentifiers.id_blake2b512.Id] = "BLAKE2B-512";
-            algorithms[MiscObjectIdentifiers.id_blake2s128.Id] = "BLAKE2S-128";
-            algorithms[MiscObjectIdentifiers.id_blake2s160.Id] = "BLAKE2S-160";
-            algorithms[MiscObjectIdentifiers.id_blake2s224.Id] = "BLAKE2S-224";
-            algorithms[MiscObjectIdentifiers.id_blake2s256.Id] = "BLAKE2S-256";
-
-            algorithms[RosstandartObjectIdentifiers.id_tc26_gost_3411_12_256.Id] = "GOST3411-2012-256";
-            algorithms[RosstandartObjectIdentifiers.id_tc26_gost_3411_12_512.Id] = "GOST3411-2012-512";
-
-            algorithms[UAObjectIdentifiers.dstu7564digest_256.Id] = "DSTU7564-256";
-            algorithms[UAObjectIdentifiers.dstu7564digest_384.Id] = "DSTU7564-384";
-            algorithms[UAObjectIdentifiers.dstu7564digest_512.Id] = "DSTU7564-512";
-
-            oids["MD2"] = PkcsObjectIdentifiers.MD2;
-            oids["MD4"] = PkcsObjectIdentifiers.MD4;
-            oids["MD5"] = PkcsObjectIdentifiers.MD5;
-            oids["SHA-1"] = OiwObjectIdentifiers.IdSha1;
-            oids["SHA-224"] = NistObjectIdentifiers.IdSha224;
-            oids["SHA-256"] = NistObjectIdentifiers.IdSha256;
-            oids["SHA-384"] = NistObjectIdentifiers.IdSha384;
-            oids["SHA-512"] = NistObjectIdentifiers.IdSha512;
-            oids["SHA-512/224"] = NistObjectIdentifiers.IdSha512_224;
-            oids["SHA-512/256"] = NistObjectIdentifiers.IdSha512_256;
-            oids["SHA3-224"] = NistObjectIdentifiers.IdSha3_224;
-            oids["SHA3-256"] = NistObjectIdentifiers.IdSha3_256;
-            oids["SHA3-384"] = NistObjectIdentifiers.IdSha3_384;
-            oids["SHA3-512"] = NistObjectIdentifiers.IdSha3_512;
-            oids["SHAKE128-256"] = NistObjectIdentifiers.IdShake128;
-            oids["SHAKE256-512"] = NistObjectIdentifiers.IdShake256;
-            oids["RIPEMD128"] = TeleTrusTObjectIdentifiers.RipeMD128;
-            oids["RIPEMD160"] = TeleTrusTObjectIdentifiers.RipeMD160;
-            oids["RIPEMD256"] = TeleTrusTObjectIdentifiers.RipeMD256;
-            oids["GOST3411"] = CryptoProObjectIdentifiers.GostR3411;
-            oids["SM3"] = GMObjectIdentifiers.sm3;
-            oids["BLAKE2B-160"] = MiscObjectIdentifiers.id_blake2b160;
-            oids["BLAKE2B-256"] = MiscObjectIdentifiers.id_blake2b256;
-            oids["BLAKE2B-384"] = MiscObjectIdentifiers.id_blake2b384;
-            oids["BLAKE2B-512"] = MiscObjectIdentifiers.id_blake2b512;
-            oids["BLAKE2S-128"] = MiscObjectIdentifiers.id_blake2s128;
-            oids["BLAKE2S-160"] = MiscObjectIdentifiers.id_blake2s160;
-            oids["BLAKE2S-224"] = MiscObjectIdentifiers.id_blake2s224;
-            oids["BLAKE2S-256"] = MiscObjectIdentifiers.id_blake2s256;
-            oids["GOST3411-2012-256"] = RosstandartObjectIdentifiers.id_tc26_gost_3411_12_256;
-            oids["GOST3411-2012-512"] = RosstandartObjectIdentifiers.id_tc26_gost_3411_12_512;
-            oids["DSTU7564-256"] = UAObjectIdentifiers.dstu7564digest_256;
-            oids["DSTU7564-384"] = UAObjectIdentifiers.dstu7564digest_384;
-            oids["DSTU7564-512"] = UAObjectIdentifiers.dstu7564digest_512;
+            Aliases[PkcsObjectIdentifiers.MD2.Id] = "MD2";
+            Aliases[PkcsObjectIdentifiers.MD4.Id] = "MD4";
+            Aliases[PkcsObjectIdentifiers.MD5.Id] = "MD5";
+
+            Aliases["SHA1"] = "SHA-1";
+            Aliases[OiwObjectIdentifiers.IdSha1.Id] = "SHA-1";
+            Aliases[PkcsObjectIdentifiers.IdHmacWithSha1.Id] = "SHA-1";
+            Aliases[MiscObjectIdentifiers.HMAC_SHA1.Id] = "SHA-1";
+            Aliases["SHA224"] = "SHA-224";
+            Aliases[NistObjectIdentifiers.IdSha224.Id] = "SHA-224";
+            Aliases[PkcsObjectIdentifiers.IdHmacWithSha224.Id] = "SHA-224";
+            Aliases["SHA256"] = "SHA-256";
+            Aliases[NistObjectIdentifiers.IdSha256.Id] = "SHA-256";
+            Aliases[PkcsObjectIdentifiers.IdHmacWithSha256.Id] = "SHA-256";
+            Aliases["SHA384"] = "SHA-384";
+            Aliases[NistObjectIdentifiers.IdSha384.Id] = "SHA-384";
+            Aliases[PkcsObjectIdentifiers.IdHmacWithSha384.Id] = "SHA-384";
+            Aliases["SHA512"] = "SHA-512";
+            Aliases[NistObjectIdentifiers.IdSha512.Id] = "SHA-512";
+            Aliases[PkcsObjectIdentifiers.IdHmacWithSha512.Id] = "SHA-512";
+
+            Aliases["SHA512/224"] = "SHA-512/224";
+            Aliases["SHA512(224)"] = "SHA-512/224";
+            Aliases["SHA-512(224)"] = "SHA-512/224";
+            Aliases[NistObjectIdentifiers.IdSha512_224.Id] = "SHA-512/224";
+            Aliases["SHA512/256"] = "SHA-512/256";
+            Aliases["SHA512(256)"] = "SHA-512/256";
+            Aliases["SHA-512(256)"] = "SHA-512/256";
+            Aliases[NistObjectIdentifiers.IdSha512_256.Id] = "SHA-512/256";
+
+            Aliases["RIPEMD-128"] = "RIPEMD128";
+            Aliases[TeleTrusTObjectIdentifiers.RipeMD128.Id] = "RIPEMD128";
+            Aliases["RIPEMD-160"] = "RIPEMD160";
+            Aliases[TeleTrusTObjectIdentifiers.RipeMD160.Id] = "RIPEMD160";
+            Aliases["RIPEMD-256"] = "RIPEMD256";
+            Aliases[TeleTrusTObjectIdentifiers.RipeMD256.Id] = "RIPEMD256";
+            Aliases["RIPEMD-320"] = "RIPEMD320";
+            //Aliases[TeleTrusTObjectIdentifiers.RipeMD320.Id] = "RIPEMD320";
+
+            Aliases[CryptoProObjectIdentifiers.GostR3411.Id] = "GOST3411";
+
+            Aliases["KECCAK224"] = "KECCAK-224";
+            Aliases["KECCAK256"] = "KECCAK-256";
+            Aliases["KECCAK288"] = "KECCAK-288";
+            Aliases["KECCAK384"] = "KECCAK-384";
+            Aliases["KECCAK512"] = "KECCAK-512";
+
+            Aliases[NistObjectIdentifiers.IdSha3_224.Id] = "SHA3-224";
+            Aliases[NistObjectIdentifiers.IdHMacWithSha3_224.Id] = "SHA3-224";
+            Aliases[NistObjectIdentifiers.IdSha3_256.Id] = "SHA3-256";
+            Aliases[NistObjectIdentifiers.IdHMacWithSha3_256.Id] = "SHA3-256";
+            Aliases[NistObjectIdentifiers.IdSha3_384.Id] = "SHA3-384";
+            Aliases[NistObjectIdentifiers.IdHMacWithSha3_384.Id] = "SHA3-384";
+            Aliases[NistObjectIdentifiers.IdSha3_512.Id] = "SHA3-512";
+            Aliases[NistObjectIdentifiers.IdHMacWithSha3_512.Id] = "SHA3-512";
+            Aliases["SHAKE128"] = "SHAKE128-256";
+            Aliases[NistObjectIdentifiers.IdShake128.Id] = "SHAKE128-256";
+            Aliases["SHAKE256"] = "SHAKE256-512";
+            Aliases[NistObjectIdentifiers.IdShake256.Id] = "SHAKE256-512";
+
+            Aliases[GMObjectIdentifiers.sm3.Id] = "SM3";
+
+            Aliases[MiscObjectIdentifiers.id_blake2b160.Id] = "BLAKE2B-160";
+            Aliases[MiscObjectIdentifiers.id_blake2b256.Id] = "BLAKE2B-256";
+            Aliases[MiscObjectIdentifiers.id_blake2b384.Id] = "BLAKE2B-384";
+            Aliases[MiscObjectIdentifiers.id_blake2b512.Id] = "BLAKE2B-512";
+            Aliases[MiscObjectIdentifiers.id_blake2s128.Id] = "BLAKE2S-128";
+            Aliases[MiscObjectIdentifiers.id_blake2s160.Id] = "BLAKE2S-160";
+            Aliases[MiscObjectIdentifiers.id_blake2s224.Id] = "BLAKE2S-224";
+            Aliases[MiscObjectIdentifiers.id_blake2s256.Id] = "BLAKE2S-256";
+
+            Aliases[RosstandartObjectIdentifiers.id_tc26_gost_3411_12_256.Id] = "GOST3411-2012-256";
+            Aliases[RosstandartObjectIdentifiers.id_tc26_gost_3411_12_512.Id] = "GOST3411-2012-512";
+
+            Aliases[UAObjectIdentifiers.dstu7564digest_256.Id] = "DSTU7564-256";
+            Aliases[UAObjectIdentifiers.dstu7564digest_384.Id] = "DSTU7564-384";
+            Aliases[UAObjectIdentifiers.dstu7564digest_512.Id] = "DSTU7564-512";
+
+            Oids["MD2"] = PkcsObjectIdentifiers.MD2;
+            Oids["MD4"] = PkcsObjectIdentifiers.MD4;
+            Oids["MD5"] = PkcsObjectIdentifiers.MD5;
+            Oids["SHA-1"] = OiwObjectIdentifiers.IdSha1;
+            Oids["SHA-224"] = NistObjectIdentifiers.IdSha224;
+            Oids["SHA-256"] = NistObjectIdentifiers.IdSha256;
+            Oids["SHA-384"] = NistObjectIdentifiers.IdSha384;
+            Oids["SHA-512"] = NistObjectIdentifiers.IdSha512;
+            Oids["SHA-512/224"] = NistObjectIdentifiers.IdSha512_224;
+            Oids["SHA-512/256"] = NistObjectIdentifiers.IdSha512_256;
+            Oids["SHA3-224"] = NistObjectIdentifiers.IdSha3_224;
+            Oids["SHA3-256"] = NistObjectIdentifiers.IdSha3_256;
+            Oids["SHA3-384"] = NistObjectIdentifiers.IdSha3_384;
+            Oids["SHA3-512"] = NistObjectIdentifiers.IdSha3_512;
+            Oids["SHAKE128-256"] = NistObjectIdentifiers.IdShake128;
+            Oids["SHAKE256-512"] = NistObjectIdentifiers.IdShake256;
+            Oids["RIPEMD128"] = TeleTrusTObjectIdentifiers.RipeMD128;
+            Oids["RIPEMD160"] = TeleTrusTObjectIdentifiers.RipeMD160;
+            Oids["RIPEMD256"] = TeleTrusTObjectIdentifiers.RipeMD256;
+            Oids["GOST3411"] = CryptoProObjectIdentifiers.GostR3411;
+            Oids["SM3"] = GMObjectIdentifiers.sm3;
+            Oids["BLAKE2B-160"] = MiscObjectIdentifiers.id_blake2b160;
+            Oids["BLAKE2B-256"] = MiscObjectIdentifiers.id_blake2b256;
+            Oids["BLAKE2B-384"] = MiscObjectIdentifiers.id_blake2b384;
+            Oids["BLAKE2B-512"] = MiscObjectIdentifiers.id_blake2b512;
+            Oids["BLAKE2S-128"] = MiscObjectIdentifiers.id_blake2s128;
+            Oids["BLAKE2S-160"] = MiscObjectIdentifiers.id_blake2s160;
+            Oids["BLAKE2S-224"] = MiscObjectIdentifiers.id_blake2s224;
+            Oids["BLAKE2S-256"] = MiscObjectIdentifiers.id_blake2s256;
+            Oids["GOST3411-2012-256"] = RosstandartObjectIdentifiers.id_tc26_gost_3411_12_256;
+            Oids["GOST3411-2012-512"] = RosstandartObjectIdentifiers.id_tc26_gost_3411_12_512;
+            Oids["DSTU7564-256"] = UAObjectIdentifiers.dstu7564digest_256;
+            Oids["DSTU7564-384"] = UAObjectIdentifiers.dstu7564digest_384;
+            Oids["DSTU7564-512"] = UAObjectIdentifiers.dstu7564digest_512;
         }
 
         /// <summary>
@@ -174,42 +172,27 @@ namespace Org.BouncyCastle.Security
         /// <param name="mechanism">A string representation of the digest meanism.</param>
         /// <returns>A DerObjectIdentifier, null if the Oid is not available.</returns>
 
-        public static DerObjectIdentifier GetObjectIdentifier(
-            string mechanism)
+        public static DerObjectIdentifier GetObjectIdentifier(string mechanism)
         {
             if (mechanism == null)
-                throw new System.ArgumentNullException("mechanism");
-
-            mechanism = Platform.ToUpperInvariant(mechanism);
-            string aliased = (string) algorithms[mechanism];
+                throw new ArgumentNullException(nameof(mechanism));
 
-            if (aliased != null)
-                mechanism = aliased;
+            mechanism = CollectionUtilities.GetValueOrKey(Aliases, mechanism).ToUpperInvariant();
 
-            return (DerObjectIdentifier) oids[mechanism];
+            return CollectionUtilities.GetValueOrNull(Oids, mechanism);
         }
 
-        public static ICollection Algorithms
-        {
-            get { return oids.Keys; }
-        }
-
-        public static IDigest GetDigest(
-            DerObjectIdentifier id)
+        public static IDigest GetDigest(DerObjectIdentifier id)
         {
             return GetDigest(id.Id);
         }
 
-        public static IDigest GetDigest(
-            string algorithm)
+        public static IDigest GetDigest(string algorithm)
         {
-            string upper = Platform.ToUpperInvariant(algorithm);
-            string mechanism = (string) algorithms[upper];
+            if (algorithm == null)
+                throw new ArgumentNullException(nameof(algorithm));
 
-            if (mechanism == null)
-            {
-                mechanism = upper;
-            }
+            string mechanism = CollectionUtilities.GetValueOrKey(Aliases, algorithm).ToUpperInvariant();
 
             try
             {
@@ -218,49 +201,49 @@ namespace Org.BouncyCastle.Security
 
                 switch (digestAlgorithm)
                 {
-                    case DigestAlgorithm.BLAKE2B_160: return new Blake2bDigest(160);
-                    case DigestAlgorithm.BLAKE2B_256: return new Blake2bDigest(256);
-                    case DigestAlgorithm.BLAKE2B_384: return new Blake2bDigest(384);
-                    case DigestAlgorithm.BLAKE2B_512: return new Blake2bDigest(512);
-                    case DigestAlgorithm.BLAKE2S_128: return new Blake2sDigest(128);
-                    case DigestAlgorithm.BLAKE2S_160: return new Blake2sDigest(160);
-                    case DigestAlgorithm.BLAKE2S_224: return new Blake2sDigest(224);
-                    case DigestAlgorithm.BLAKE2S_256: return new Blake2sDigest(256);
-                    case DigestAlgorithm.DSTU7564_256: return new Dstu7564Digest(256);
-                    case DigestAlgorithm.DSTU7564_384: return new Dstu7564Digest(384);
-                    case DigestAlgorithm.DSTU7564_512: return new Dstu7564Digest(512);
-                    case DigestAlgorithm.GOST3411: return new Gost3411Digest();
-                    case DigestAlgorithm.GOST3411_2012_256: return new Gost3411_2012_256Digest();
-                    case DigestAlgorithm.GOST3411_2012_512: return new Gost3411_2012_512Digest();
-                    case DigestAlgorithm.KECCAK_224: return new KeccakDigest(224);
-                    case DigestAlgorithm.KECCAK_256: return new KeccakDigest(256);
-                    case DigestAlgorithm.KECCAK_288: return new KeccakDigest(288);
-                    case DigestAlgorithm.KECCAK_384: return new KeccakDigest(384);
-                    case DigestAlgorithm.KECCAK_512: return new KeccakDigest(512);
-                    case DigestAlgorithm.MD2: return new MD2Digest();
-                    case DigestAlgorithm.MD4: return new MD4Digest();
-                    case DigestAlgorithm.MD5: return new MD5Digest();
-                    case DigestAlgorithm.NONE: return new NullDigest();
-                    case DigestAlgorithm.RIPEMD128: return new RipeMD128Digest();
-                    case DigestAlgorithm.RIPEMD160: return new RipeMD160Digest();
-                    case DigestAlgorithm.RIPEMD256: return new RipeMD256Digest();
-                    case DigestAlgorithm.RIPEMD320: return new RipeMD320Digest();
-                    case DigestAlgorithm.SHA_1: return new Sha1Digest();
-                    case DigestAlgorithm.SHA_224: return new Sha224Digest();
-                    case DigestAlgorithm.SHA_256: return new Sha256Digest();
-                    case DigestAlgorithm.SHA_384: return new Sha384Digest();
-                    case DigestAlgorithm.SHA_512: return new Sha512Digest();
-                    case DigestAlgorithm.SHA_512_224: return new Sha512tDigest(224);
-                    case DigestAlgorithm.SHA_512_256: return new Sha512tDigest(256);
-                    case DigestAlgorithm.SHA3_224: return new Sha3Digest(224);
-                    case DigestAlgorithm.SHA3_256: return new Sha3Digest(256);
-                    case DigestAlgorithm.SHA3_384: return new Sha3Digest(384);
-                    case DigestAlgorithm.SHA3_512: return new Sha3Digest(512);
-                    case DigestAlgorithm.SHAKE128_256: return new ShakeDigest(128);
-                    case DigestAlgorithm.SHAKE256_512: return new ShakeDigest(256);
-                    case DigestAlgorithm.SM3: return new SM3Digest();
-                    case DigestAlgorithm.TIGER: return new TigerDigest();
-                    case DigestAlgorithm.WHIRLPOOL: return new WhirlpoolDigest();
+                case DigestAlgorithm.BLAKE2B_160: return new Blake2bDigest(160);
+                case DigestAlgorithm.BLAKE2B_256: return new Blake2bDigest(256);
+                case DigestAlgorithm.BLAKE2B_384: return new Blake2bDigest(384);
+                case DigestAlgorithm.BLAKE2B_512: return new Blake2bDigest(512);
+                case DigestAlgorithm.BLAKE2S_128: return new Blake2sDigest(128);
+                case DigestAlgorithm.BLAKE2S_160: return new Blake2sDigest(160);
+                case DigestAlgorithm.BLAKE2S_224: return new Blake2sDigest(224);
+                case DigestAlgorithm.BLAKE2S_256: return new Blake2sDigest(256);
+                case DigestAlgorithm.DSTU7564_256: return new Dstu7564Digest(256);
+                case DigestAlgorithm.DSTU7564_384: return new Dstu7564Digest(384);
+                case DigestAlgorithm.DSTU7564_512: return new Dstu7564Digest(512);
+                case DigestAlgorithm.GOST3411: return new Gost3411Digest();
+                case DigestAlgorithm.GOST3411_2012_256: return new Gost3411_2012_256Digest();
+                case DigestAlgorithm.GOST3411_2012_512: return new Gost3411_2012_512Digest();
+                case DigestAlgorithm.KECCAK_224: return new KeccakDigest(224);
+                case DigestAlgorithm.KECCAK_256: return new KeccakDigest(256);
+                case DigestAlgorithm.KECCAK_288: return new KeccakDigest(288);
+                case DigestAlgorithm.KECCAK_384: return new KeccakDigest(384);
+                case DigestAlgorithm.KECCAK_512: return new KeccakDigest(512);
+                case DigestAlgorithm.MD2: return new MD2Digest();
+                case DigestAlgorithm.MD4: return new MD4Digest();
+                case DigestAlgorithm.MD5: return new MD5Digest();
+                case DigestAlgorithm.NONE: return new NullDigest();
+                case DigestAlgorithm.RIPEMD128: return new RipeMD128Digest();
+                case DigestAlgorithm.RIPEMD160: return new RipeMD160Digest();
+                case DigestAlgorithm.RIPEMD256: return new RipeMD256Digest();
+                case DigestAlgorithm.RIPEMD320: return new RipeMD320Digest();
+                case DigestAlgorithm.SHA_1: return new Sha1Digest();
+                case DigestAlgorithm.SHA_224: return new Sha224Digest();
+                case DigestAlgorithm.SHA_256: return new Sha256Digest();
+                case DigestAlgorithm.SHA_384: return new Sha384Digest();
+                case DigestAlgorithm.SHA_512: return new Sha512Digest();
+                case DigestAlgorithm.SHA_512_224: return new Sha512tDigest(224);
+                case DigestAlgorithm.SHA_512_256: return new Sha512tDigest(256);
+                case DigestAlgorithm.SHA3_224: return new Sha3Digest(224);
+                case DigestAlgorithm.SHA3_256: return new Sha3Digest(256);
+                case DigestAlgorithm.SHA3_384: return new Sha3Digest(384);
+                case DigestAlgorithm.SHA3_512: return new Sha3Digest(512);
+                case DigestAlgorithm.SHAKE128_256: return new ShakeDigest(128);
+                case DigestAlgorithm.SHAKE256_512: return new ShakeDigest(256);
+                case DigestAlgorithm.SM3: return new SM3Digest();
+                case DigestAlgorithm.TIGER: return new TigerDigest();
+                case DigestAlgorithm.WHIRLPOOL: return new WhirlpoolDigest();
                 }
             }
             catch (ArgumentException)
@@ -270,10 +253,9 @@ namespace Org.BouncyCastle.Security
             throw new SecurityUtilityException("Digest " + mechanism + " not recognised.");
         }
 
-        public static string GetAlgorithmName(
-            DerObjectIdentifier oid)
+        public static string GetAlgorithmName(DerObjectIdentifier oid)
         {
-            return (string) algorithms[oid.Id];
+            return CollectionUtilities.GetValueOrNull(Aliases, oid.Id);
         }
 
         public static byte[] CalculateDigest(DerObjectIdentifier id, byte[] input)
@@ -288,17 +270,14 @@ namespace Org.BouncyCastle.Security
             return DoFinal(digest);
         }
 
-        public static byte[] DoFinal(
-            IDigest digest)
+        public static byte[] DoFinal(IDigest digest)
         {
             byte[] b = new byte[digest.GetDigestSize()];
             digest.DoFinal(b, 0);
             return b;
         }
 
-        public static byte[] DoFinal(
-            IDigest	digest,
-            byte[]	input)
+        public static byte[] DoFinal(IDigest digest, byte[] input)
         {
             digest.BlockUpdate(input, 0, input.Length);
             return DoFinal(digest);