Merge in bc-git to this repo

1 files changed, 698 insertions, 659 deletions

diff --git a/crypto/src/security/CipherUtilities.cs b/crypto/src/security/CipherUtilities.cs
index ffd7d1373..cdb711f69 100644
--- a/crypto/src/security/CipherUtilities.cs
+++ b/crypto/src/security/CipherUtilities.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Globalization;
 
 using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.CryptoPro;
@@ -22,675 +21,715 @@ using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Security
 {
-	/// <remarks>
-	///  Cipher Utility class contains methods that can not be specifically grouped into other classes.
-	/// </remarks>
-	public sealed class CipherUtilities
-	{
-		internal enum CipherAlgorithm {
-			AES,
-			ARC4,
-			BLOWFISH,
-			CAMELLIA,
-			CAST5,
-			CAST6,
-			DES,
-			DESEDE,
-			ELGAMAL,
-			GOST28147,
-			HC128,
-			HC256,
-			IDEA,
-			NOEKEON,
-			PBEWITHSHAAND128BITRC4,
-			PBEWITHSHAAND40BITRC4,
-			RC2,
-			RC5,
-			RC5_64,
-			RC6,
-			RIJNDAEL,
-			RSA,
-			SALSA20,
-			SEED,
-			SERPENT,
-			SKIPJACK,
-			TEA,
-			TWOFISH,
-			VMPC,
-			VMPC_KSA3,
-			XTEA,
-		};
-		
-		internal enum CipherMode { ECB, NONE, CBC, CCM, CFB, CTR, CTS, EAX, GCM, GOFB, OFB, OPENPGPCFB, SIC };
-		internal enum CipherPadding
-		{
-			NOPADDING,
-			RAW,
-			ISO10126PADDING,
-			ISO10126D2PADDING,
-			ISO10126_2PADDING,
-			ISO7816_4PADDING,
-			ISO9797_1PADDING,
-			ISO9796_1,
-			ISO9796_1PADDING,
-			OAEP,
-			OAEPPADDING,
-			OAEPWITHMD5ANDMGF1PADDING,
-			OAEPWITHSHA1ANDMGF1PADDING,
-			OAEPWITHSHA_1ANDMGF1PADDING,
-			OAEPWITHSHA224ANDMGF1PADDING,
-			OAEPWITHSHA_224ANDMGF1PADDING,
-			OAEPWITHSHA256ANDMGF1PADDING,
-			OAEPWITHSHA_256ANDMGF1PADDING,
-			OAEPWITHSHA384ANDMGF1PADDING,
-			OAEPWITHSHA_384ANDMGF1PADDING,
-			OAEPWITHSHA512ANDMGF1PADDING,
-			OAEPWITHSHA_512ANDMGF1PADDING,
-			PKCS1,
-			PKCS1PADDING,
-			PKCS5,
-			PKCS5PADDING,
-			PKCS7,
-			PKCS7PADDING,
-			TBCPADDING,
-			WITHCTS,
-			X923PADDING,
-			ZEROBYTEPADDING,
-		};
-
-		private static readonly IDictionary algorithms = Platform.CreateHashtable();
+    /// <remarks>
+    ///  Cipher Utility class contains methods that can not be specifically grouped into other classes.
+    /// </remarks>
+    public sealed class CipherUtilities
+    {
+        private enum CipherAlgorithm {
+            AES,
+            ARC4,
+            BLOWFISH,
+            CAMELLIA,
+            CAST5,
+            CAST6,
+            DES,
+            DESEDE,
+            ELGAMAL,
+            GOST28147,
+            HC128,
+            HC256,
+            IDEA,
+            NOEKEON,
+            PBEWITHSHAAND128BITRC4,
+            PBEWITHSHAAND40BITRC4,
+            RC2,
+            RC5,
+            RC5_64,
+            RC6,
+            RIJNDAEL,
+            RSA,
+            SALSA20,
+            SEED,
+            SERPENT,
+            SKIPJACK,
+            TEA,
+            TWOFISH,
+            VMPC,
+            VMPC_KSA3,
+            XTEA,
+        };
+        
+        private enum CipherMode { ECB, NONE, CBC, CCM, CFB, CTR, CTS, EAX, GCM, GOFB, OCB, OFB, OPENPGPCFB, SIC };
+        private enum CipherPadding
+        {
+            NOPADDING,
+            RAW,
+            ISO10126PADDING,
+            ISO10126D2PADDING,
+            ISO10126_2PADDING,
+            ISO7816_4PADDING,
+            ISO9797_1PADDING,
+            ISO9796_1,
+            ISO9796_1PADDING,
+            OAEP,
+            OAEPPADDING,
+            OAEPWITHMD5ANDMGF1PADDING,
+            OAEPWITHSHA1ANDMGF1PADDING,
+            OAEPWITHSHA_1ANDMGF1PADDING,
+            OAEPWITHSHA224ANDMGF1PADDING,
+            OAEPWITHSHA_224ANDMGF1PADDING,
+            OAEPWITHSHA256ANDMGF1PADDING,
+            OAEPWITHSHA_256ANDMGF1PADDING,
+            OAEPWITHSHA384ANDMGF1PADDING,
+            OAEPWITHSHA_384ANDMGF1PADDING,
+            OAEPWITHSHA512ANDMGF1PADDING,
+            OAEPWITHSHA_512ANDMGF1PADDING,
+            PKCS1,
+            PKCS1PADDING,
+            PKCS5,
+            PKCS5PADDING,
+            PKCS7,
+            PKCS7PADDING,
+            TBCPADDING,
+            WITHCTS,
+            X923PADDING,
+            ZEROBYTEPADDING,
+        };
+
+        private static readonly IDictionary algorithms = Platform.CreateHashtable();
         private static readonly IDictionary oids = Platform.CreateHashtable();
 
-		static CipherUtilities()
-		{
-			// Signal to obfuscation tools not to change enum constants
-			((CipherAlgorithm)Enums.GetArbitraryValue(typeof(CipherAlgorithm))).ToString();
-			((CipherMode)Enums.GetArbitraryValue(typeof(CipherMode))).ToString();
-			((CipherPadding)Enums.GetArbitraryValue(typeof(CipherPadding))).ToString();
+        static CipherUtilities()
+        {
+            // Signal to obfuscation tools not to change enum constants
+            ((CipherAlgorithm)Enums.GetArbitraryValue(typeof(CipherAlgorithm))).ToString();
+            ((CipherMode)Enums.GetArbitraryValue(typeof(CipherMode))).ToString();
+            ((CipherPadding)Enums.GetArbitraryValue(typeof(CipherPadding))).ToString();
 
-			// TODO Flesh out the list of aliases
+            // TODO Flesh out the list of aliases
 
-			algorithms[NistObjectIdentifiers.IdAes128Ecb.Id] = "AES/ECB/PKCS7PADDING";
-			algorithms[NistObjectIdentifiers.IdAes192Ecb.Id] = "AES/ECB/PKCS7PADDING";
-			algorithms[NistObjectIdentifiers.IdAes256Ecb.Id] = "AES/ECB/PKCS7PADDING";
-			algorithms["AES//PKCS7"] = "AES/ECB/PKCS7PADDING";
-			algorithms["AES//PKCS7PADDING"] = "AES/ECB/PKCS7PADDING";
-			algorithms["AES//PKCS5"] = "AES/ECB/PKCS7PADDING";
-			algorithms["AES//PKCS5PADDING"] = "AES/ECB/PKCS7PADDING";
+            algorithms[NistObjectIdentifiers.IdAes128Ecb.Id] = "AES/ECB/PKCS7PADDING";
+            algorithms[NistObjectIdentifiers.IdAes192Ecb.Id] = "AES/ECB/PKCS7PADDING";
+            algorithms[NistObjectIdentifiers.IdAes256Ecb.Id] = "AES/ECB/PKCS7PADDING";
+            algorithms["AES//PKCS7"] = "AES/ECB/PKCS7PADDING";
+            algorithms["AES//PKCS7PADDING"] = "AES/ECB/PKCS7PADDING";
+            algorithms["AES//PKCS5"] = "AES/ECB/PKCS7PADDING";
+            algorithms["AES//PKCS5PADDING"] = "AES/ECB/PKCS7PADDING";
 
-			algorithms[NistObjectIdentifiers.IdAes128Cbc.Id] = "AES/CBC/PKCS7PADDING";
-			algorithms[NistObjectIdentifiers.IdAes192Cbc.Id] = "AES/CBC/PKCS7PADDING";
-			algorithms[NistObjectIdentifiers.IdAes256Cbc.Id] = "AES/CBC/PKCS7PADDING";
+            algorithms[NistObjectIdentifiers.IdAes128Cbc.Id] = "AES/CBC/PKCS7PADDING";
+            algorithms[NistObjectIdentifiers.IdAes192Cbc.Id] = "AES/CBC/PKCS7PADDING";
+            algorithms[NistObjectIdentifiers.IdAes256Cbc.Id] = "AES/CBC/PKCS7PADDING";
 
-			algorithms[NistObjectIdentifiers.IdAes128Ofb.Id] = "AES/OFB/NOPADDING";
-			algorithms[NistObjectIdentifiers.IdAes192Ofb.Id] = "AES/OFB/NOPADDING";
-			algorithms[NistObjectIdentifiers.IdAes256Ofb.Id] = "AES/OFB/NOPADDING";
+            algorithms[NistObjectIdentifiers.IdAes128Ofb.Id] = "AES/OFB/NOPADDING";
+            algorithms[NistObjectIdentifiers.IdAes192Ofb.Id] = "AES/OFB/NOPADDING";
+            algorithms[NistObjectIdentifiers.IdAes256Ofb.Id] = "AES/OFB/NOPADDING";
 
-			algorithms[NistObjectIdentifiers.IdAes128Cfb.Id] = "AES/CFB/NOPADDING";
-			algorithms[NistObjectIdentifiers.IdAes192Cfb.Id] = "AES/CFB/NOPADDING";
-			algorithms[NistObjectIdentifiers.IdAes256Cfb.Id] = "AES/CFB/NOPADDING";
+            algorithms[NistObjectIdentifiers.IdAes128Cfb.Id] = "AES/CFB/NOPADDING";
+            algorithms[NistObjectIdentifiers.IdAes192Cfb.Id] = "AES/CFB/NOPADDING";
+            algorithms[NistObjectIdentifiers.IdAes256Cfb.Id] = "AES/CFB/NOPADDING";
 
-			algorithms["RSA/ECB/PKCS1"] = "RSA//PKCS1PADDING";
-			algorithms["RSA/ECB/PKCS1PADDING"] = "RSA//PKCS1PADDING";
-			algorithms[PkcsObjectIdentifiers.RsaEncryption.Id] = "RSA//PKCS1PADDING";
-			algorithms[PkcsObjectIdentifiers.IdRsaesOaep.Id] = "RSA//OAEPPADDING";
+            algorithms["RSA/ECB/PKCS1"] = "RSA//PKCS1PADDING";
+            algorithms["RSA/ECB/PKCS1PADDING"] = "RSA//PKCS1PADDING";
+            algorithms[PkcsObjectIdentifiers.RsaEncryption.Id] = "RSA//PKCS1PADDING";
+            algorithms[PkcsObjectIdentifiers.IdRsaesOaep.Id] = "RSA//OAEPPADDING";
 
-			algorithms[OiwObjectIdentifiers.DesCbc.Id] = "DES/CBC";
-			algorithms[OiwObjectIdentifiers.DesCfb.Id] = "DES/CFB";
-			algorithms[OiwObjectIdentifiers.DesEcb.Id] = "DES/ECB";
-			algorithms[OiwObjectIdentifiers.DesOfb.Id] = "DES/OFB";
-			algorithms[OiwObjectIdentifiers.DesEde.Id] = "DESEDE";
-			algorithms[PkcsObjectIdentifiers.DesEde3Cbc.Id] = "DESEDE/CBC";
-			algorithms[PkcsObjectIdentifiers.RC2Cbc.Id] = "RC2/CBC";
-			algorithms["1.3.6.1.4.1.188.7.1.1.2"] = "IDEA/CBC";
-			algorithms["1.2.840.113533.7.66.10"] = "CAST5/CBC";
-
-			algorithms["RC4"] = "ARC4";
-			algorithms["ARCFOUR"] = "ARC4";
-			algorithms["1.2.840.113549.3.4"] = "ARC4";
+            algorithms[OiwObjectIdentifiers.DesCbc.Id] = "DES/CBC";
+            algorithms[OiwObjectIdentifiers.DesCfb.Id] = "DES/CFB";
+            algorithms[OiwObjectIdentifiers.DesEcb.Id] = "DES/ECB";
+            algorithms[OiwObjectIdentifiers.DesOfb.Id] = "DES/OFB";
+            algorithms[OiwObjectIdentifiers.DesEde.Id] = "DESEDE";
+            algorithms["TDEA"] = "DESEDE";
+            algorithms[PkcsObjectIdentifiers.DesEde3Cbc.Id] = "DESEDE/CBC";
+            algorithms[PkcsObjectIdentifiers.RC2Cbc.Id] = "RC2/CBC";
+            algorithms["1.3.6.1.4.1.188.7.1.1.2"] = "IDEA/CBC";
+            algorithms["1.2.840.113533.7.66.10"] = "CAST5/CBC";
+
+            algorithms["RC4"] = "ARC4";
+            algorithms["ARCFOUR"] = "ARC4";
+            algorithms["1.2.840.113549.3.4"] = "ARC4";
 
 
 
-			algorithms["PBEWITHSHA1AND128BITRC4"] = "PBEWITHSHAAND128BITRC4";
-			algorithms[PkcsObjectIdentifiers.PbeWithShaAnd128BitRC4.Id] = "PBEWITHSHAAND128BITRC4";
-			algorithms["PBEWITHSHA1AND40BITRC4"] = "PBEWITHSHAAND40BITRC4";
-			algorithms[PkcsObjectIdentifiers.PbeWithShaAnd40BitRC4.Id] = "PBEWITHSHAAND40BITRC4";
+            algorithms["PBEWITHSHA1AND128BITRC4"] = "PBEWITHSHAAND128BITRC4";
+            algorithms[PkcsObjectIdentifiers.PbeWithShaAnd128BitRC4.Id] = "PBEWITHSHAAND128BITRC4";
+            algorithms["PBEWITHSHA1AND40BITRC4"] = "PBEWITHSHAAND40BITRC4";
+            algorithms[PkcsObjectIdentifiers.PbeWithShaAnd40BitRC4.Id] = "PBEWITHSHAAND40BITRC4";
 
-			algorithms["PBEWITHSHA1ANDDES"] = "PBEWITHSHA1ANDDES-CBC";
-			algorithms[PkcsObjectIdentifiers.PbeWithSha1AndDesCbc.Id] = "PBEWITHSHA1ANDDES-CBC";
-			algorithms["PBEWITHSHA1ANDRC2"] = "PBEWITHSHA1ANDRC2-CBC";
-			algorithms[PkcsObjectIdentifiers.PbeWithSha1AndRC2Cbc.Id] = "PBEWITHSHA1ANDRC2-CBC";
-
-			algorithms["PBEWITHSHA1AND3-KEYTRIPLEDES-CBC"] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
-			algorithms["PBEWITHSHAAND3KEYTRIPLEDES"] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
-			algorithms[PkcsObjectIdentifiers.PbeWithShaAnd3KeyTripleDesCbc.Id] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
-			algorithms["PBEWITHSHA1ANDDESEDE"] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
-
-			algorithms["PBEWITHSHA1AND2-KEYTRIPLEDES-CBC"] = "PBEWITHSHAAND2-KEYTRIPLEDES-CBC";
-			algorithms[PkcsObjectIdentifiers.PbeWithShaAnd2KeyTripleDesCbc.Id] = "PBEWITHSHAAND2-KEYTRIPLEDES-CBC";
-
-			algorithms["PBEWITHSHA1AND128BITRC2-CBC"] = "PBEWITHSHAAND128BITRC2-CBC";
-			algorithms[PkcsObjectIdentifiers.PbeWithShaAnd128BitRC2Cbc.Id] = "PBEWITHSHAAND128BITRC2-CBC";
-
-			algorithms["PBEWITHSHA1AND40BITRC2-CBC"] = "PBEWITHSHAAND40BITRC2-CBC";
-			algorithms[PkcsObjectIdentifiers.PbewithShaAnd40BitRC2Cbc.Id] = "PBEWITHSHAAND40BITRC2-CBC";
-
-			algorithms["PBEWITHSHA1AND128BITAES-CBC-BC"] = "PBEWITHSHAAND128BITAES-CBC-BC";
-			algorithms["PBEWITHSHA-1AND128BITAES-CBC-BC"] = "PBEWITHSHAAND128BITAES-CBC-BC";
-
-			algorithms["PBEWITHSHA1AND192BITAES-CBC-BC"] = "PBEWITHSHAAND192BITAES-CBC-BC";
-			algorithms["PBEWITHSHA-1AND192BITAES-CBC-BC"] = "PBEWITHSHAAND192BITAES-CBC-BC";
-
-			algorithms["PBEWITHSHA1AND256BITAES-CBC-BC"] = "PBEWITHSHAAND256BITAES-CBC-BC";
-			algorithms["PBEWITHSHA-1AND256BITAES-CBC-BC"] = "PBEWITHSHAAND256BITAES-CBC-BC";
-
-			algorithms["PBEWITHSHA-256AND128BITAES-CBC-BC"] = "PBEWITHSHA256AND128BITAES-CBC-BC";
-			algorithms["PBEWITHSHA-256AND192BITAES-CBC-BC"] = "PBEWITHSHA256AND192BITAES-CBC-BC";
-			algorithms["PBEWITHSHA-256AND256BITAES-CBC-BC"] = "PBEWITHSHA256AND256BITAES-CBC-BC";
-
-
-			algorithms["GOST"] = "GOST28147";
-			algorithms["GOST-28147"] = "GOST28147";
-			algorithms[CryptoProObjectIdentifiers.GostR28147Cbc.Id] = "GOST28147/CBC/PKCS7PADDING";
-
-			algorithms["RC5-32"] = "RC5";
-
-			algorithms[NttObjectIdentifiers.IdCamellia128Cbc.Id] = "CAMELLIA/CBC/PKCS7PADDING";
-			algorithms[NttObjectIdentifiers.IdCamellia192Cbc.Id] = "CAMELLIA/CBC/PKCS7PADDING";
-			algorithms[NttObjectIdentifiers.IdCamellia256Cbc.Id] = "CAMELLIA/CBC/PKCS7PADDING";
-
-			algorithms[KisaObjectIdentifiers.IdSeedCbc.Id] = "SEED/CBC/PKCS7PADDING";
-
-			algorithms["1.3.6.1.4.1.3029.1.2"] = "BLOWFISH/CBC";
-		}
-
-		private CipherUtilities()
-		{
-		}
-
-		/// <summary>
-		/// Returns a ObjectIdentifier for a give encoding.
-		/// </summary>
-		/// <param name="mechanism">A string representation of the encoding.</param>
-		/// <returns>A DerObjectIdentifier, null if the Oid is not available.</returns>
-		// TODO Don't really want to support this
-		public static DerObjectIdentifier GetObjectIdentifier(
-			string mechanism)
-		{
-			if (mechanism == null)
-				throw new ArgumentNullException("mechanism");
-
-			mechanism = mechanism.ToUpperInvariant();
-			string aliased = (string) algorithms[mechanism];
-
-			if (aliased != null)
-				mechanism = aliased;
-
-			return (DerObjectIdentifier) oids[mechanism];
-		}
-
-		public static ICollection Algorithms
-		{
-			get { return oids.Keys; }
-		}
-
-		public static IBufferedCipher GetCipher(
-			DerObjectIdentifier oid)
-		{
-			return GetCipher(oid.Id);
-		}
-
-		public static IBufferedCipher GetCipher(
-			string algorithm)
-		{
-			if (algorithm == null)
-				throw new ArgumentNullException("algorithm");
-
-			algorithm = algorithm.ToUpperInvariant();
-
-			string aliased = (string) algorithms[algorithm];
-
-			if (aliased != null)
-				algorithm = aliased;
-
-
-
-			IBasicAgreement iesAgreement = null;
-			if (algorithm == "IES")
-			{
-				iesAgreement = new DHBasicAgreement();
-			}
-			else if (algorithm == "ECIES")
-			{
-				iesAgreement = new ECDHBasicAgreement();
-			}
-
-			if (iesAgreement != null)
-			{
-				return new BufferedIesCipher(
-					new IesEngine(
-					iesAgreement,
-					new Kdf2BytesGenerator(
-					new Sha1Digest()),
-					new HMac(
-					new Sha1Digest())));
-			}
-
-
-
-			if (algorithm.StartsWith("PBE"))
-			{
-				if (algorithm.EndsWith("-CBC"))
-				{
-					if (algorithm == "PBEWITHSHA1ANDDES-CBC")
-					{
-						return new PaddedBufferedBlockCipher(
-							new CbcBlockCipher(new DesEngine()));
-					}
-					else if (algorithm == "PBEWITHSHA1ANDRC2-CBC")
-					{
-						return new PaddedBufferedBlockCipher(
-							new CbcBlockCipher(new RC2Engine()));
-					}
-					else if (Strings.IsOneOf(algorithm,
-						"PBEWITHSHAAND2-KEYTRIPLEDES-CBC", "PBEWITHSHAAND3-KEYTRIPLEDES-CBC"))
-					{
-						return new PaddedBufferedBlockCipher(
-							new CbcBlockCipher(new DesEdeEngine()));
-					}
-					else if (Strings.IsOneOf(algorithm,
-						"PBEWITHSHAAND128BITRC2-CBC", "PBEWITHSHAAND40BITRC2-CBC"))
-					{
-						return new PaddedBufferedBlockCipher(
-							new CbcBlockCipher(new RC2Engine()));
-					}
-				}
-				else if (algorithm.EndsWith("-BC") || algorithm.EndsWith("-OPENSSL"))
-				{
-					if (Strings.IsOneOf(algorithm,
-						"PBEWITHSHAAND128BITAES-CBC-BC",
-						"PBEWITHSHAAND192BITAES-CBC-BC",
-						"PBEWITHSHAAND256BITAES-CBC-BC",
-						"PBEWITHSHA256AND128BITAES-CBC-BC",
-						"PBEWITHSHA256AND192BITAES-CBC-BC",
-						"PBEWITHSHA256AND256BITAES-CBC-BC",
-						"PBEWITHMD5AND128BITAES-CBC-OPENSSL",
-						"PBEWITHMD5AND192BITAES-CBC-OPENSSL",
-						"PBEWITHMD5AND256BITAES-CBC-OPENSSL"))
-					{
-						return new PaddedBufferedBlockCipher(
-							new CbcBlockCipher(new AesFastEngine()));
-					}
-				}
-			}
-
-
-
-			string[] parts = algorithm.Split('/');
-
-			IBlockCipher blockCipher = null;
-			IAsymmetricBlockCipher asymBlockCipher = null;
-			IStreamCipher streamCipher = null;
-
-			string algorithmName = parts[0];
-			CipherAlgorithm cipherAlgorithm;
-			try
-			{
-				cipherAlgorithm = (CipherAlgorithm)Enums.GetEnumValue(typeof(CipherAlgorithm), algorithmName);
-			}
-			catch (ArgumentException)
-			{
-				throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-			}
-
-			switch (cipherAlgorithm)
-			{
-				case CipherAlgorithm.AES:
-					blockCipher = new AesFastEngine();
-					break;
-				case CipherAlgorithm.ARC4:
-					streamCipher = new RC4Engine();
-					break;
-				case CipherAlgorithm.BLOWFISH:
-					blockCipher = new BlowfishEngine();
-					break;
-				case CipherAlgorithm.CAMELLIA:
-					blockCipher = new CamelliaEngine();
-					break;
-				case CipherAlgorithm.CAST5:
-					blockCipher = new Cast5Engine();
-					break;
-				case CipherAlgorithm.CAST6:
-					blockCipher = new Cast6Engine();
-					break;
-				case CipherAlgorithm.DES:
-					blockCipher = new DesEngine();
-					break;
-				case CipherAlgorithm.DESEDE:
-					blockCipher = new DesEdeEngine();
-					break;
-				case CipherAlgorithm.ELGAMAL:
-					asymBlockCipher = new ElGamalEngine();
-					break;
-				case CipherAlgorithm.GOST28147:
-					blockCipher = new Gost28147Engine();
-					break;
-				case CipherAlgorithm.HC128:
-					streamCipher = new HC128Engine();
-					break;
-				case CipherAlgorithm.HC256:
-					streamCipher = new HC256Engine();
-					break;
-#if INCLUDE_IDEA
-				case CipherAlgorithm.IDEA:
-					blockCipher = new IdeaEngine();
-					break;
-#endif
-				case CipherAlgorithm.NOEKEON:
-					blockCipher = new NoekeonEngine();
-					break;
-				case CipherAlgorithm.PBEWITHSHAAND128BITRC4:
-				case CipherAlgorithm.PBEWITHSHAAND40BITRC4:
-					streamCipher = new RC4Engine();
-					break;
-				case CipherAlgorithm.RC2:
-					blockCipher = new RC2Engine();
-					break;
-				case CipherAlgorithm.RC5:
-					blockCipher = new RC532Engine();
-					break;
-				case CipherAlgorithm.RC5_64:
-					blockCipher = new RC564Engine();
-					break;
-				case CipherAlgorithm.RC6:
-					blockCipher = new RC6Engine();
-					break;
-				case CipherAlgorithm.RIJNDAEL:
-					blockCipher = new RijndaelEngine();
-					break;
-				case CipherAlgorithm.RSA:
-					asymBlockCipher = new RsaBlindedEngine();
-					break;
-				case CipherAlgorithm.SALSA20:
-					streamCipher = new Salsa20Engine();
-					break;
-				case CipherAlgorithm.SEED:
-					blockCipher = new SeedEngine();
-					break;
-				case CipherAlgorithm.SERPENT:
-					blockCipher = new SerpentEngine();
-					break;
-				case CipherAlgorithm.SKIPJACK:
-					blockCipher = new SkipjackEngine();
-					break;
-				case CipherAlgorithm.TEA:
-					blockCipher = new TeaEngine();
-					break;
-				case CipherAlgorithm.TWOFISH:
-					blockCipher = new TwofishEngine();
-					break;
-				case CipherAlgorithm.VMPC:
-					streamCipher = new VmpcEngine();
-					break;
-				case CipherAlgorithm.VMPC_KSA3:
-					streamCipher = new VmpcKsa3Engine();
-					break;
-				case CipherAlgorithm.XTEA:
-					blockCipher = new XteaEngine();
-					break;
-				default:
-					throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-			}
-
-			if (streamCipher != null)
-			{
-				if (parts.Length > 1)
-					throw new ArgumentException("Modes and paddings not used for stream ciphers");
-
-				return new BufferedStreamCipher(streamCipher);
-			}
-
-
-			bool cts = false;
-			bool padded = true;
-			IBlockCipherPadding padding = null;
-			IAeadBlockCipher aeadBlockCipher = null;
-
-			if (parts.Length > 2)
-			{
-				if (streamCipher != null)
-					throw new ArgumentException("Paddings not used for stream ciphers");
-
-				string paddingName = parts[2];
-
-				CipherPadding cipherPadding;
-				if (paddingName == "")
-				{
-					cipherPadding = CipherPadding.RAW;
-				}
-				else if (paddingName == "X9.23PADDING")
-				{
-					cipherPadding = CipherPadding.X923PADDING;
-				}
-				else
-				{
-					try
-					{
-						cipherPadding = (CipherPadding)Enums.GetEnumValue(typeof(CipherPadding), paddingName);
-					}
-					catch (ArgumentException)
-					{
-						throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-					}
-				}
-
-				switch (cipherPadding)
-				{
-					case CipherPadding.NOPADDING:
-						padded = false;
-						break;
-					case CipherPadding.RAW:
-						break;
-					case CipherPadding.ISO10126PADDING:
-					case CipherPadding.ISO10126D2PADDING:
-					case CipherPadding.ISO10126_2PADDING:
-						padding = new ISO10126d2Padding();
-						break;
-					case CipherPadding.ISO7816_4PADDING:
-					case CipherPadding.ISO9797_1PADDING:
-						padding = new ISO7816d4Padding();
-						break;
-					case CipherPadding.ISO9796_1:
-					case CipherPadding.ISO9796_1PADDING:
-						asymBlockCipher = new ISO9796d1Encoding(asymBlockCipher);
-						break;
-					case CipherPadding.OAEP:
-					case CipherPadding.OAEPPADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher);
-						break;
-					case CipherPadding.OAEPWITHMD5ANDMGF1PADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher, new MD5Digest());
-						break;
-					case CipherPadding.OAEPWITHSHA1ANDMGF1PADDING:
-					case CipherPadding.OAEPWITHSHA_1ANDMGF1PADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha1Digest());
-						break;
-					case CipherPadding.OAEPWITHSHA224ANDMGF1PADDING:
-					case CipherPadding.OAEPWITHSHA_224ANDMGF1PADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha224Digest());
-						break;
-					case CipherPadding.OAEPWITHSHA256ANDMGF1PADDING:
-					case CipherPadding.OAEPWITHSHA_256ANDMGF1PADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha256Digest());
-						break;
-					case CipherPadding.OAEPWITHSHA384ANDMGF1PADDING:
-					case CipherPadding.OAEPWITHSHA_384ANDMGF1PADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha384Digest());
-						break;
-					case CipherPadding.OAEPWITHSHA512ANDMGF1PADDING:
-					case CipherPadding.OAEPWITHSHA_512ANDMGF1PADDING:
-						asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha512Digest());
-						break;
-					case CipherPadding.PKCS1:
-					case CipherPadding.PKCS1PADDING:
-						asymBlockCipher = new Pkcs1Encoding(asymBlockCipher);
-						break;
-					case CipherPadding.PKCS5:
-					case CipherPadding.PKCS5PADDING:
-					case CipherPadding.PKCS7:
-					case CipherPadding.PKCS7PADDING:
-						padding = new Pkcs7Padding();
-						break;
-					case CipherPadding.TBCPADDING:
-						padding = new TbcPadding();
-						break;
-					case CipherPadding.WITHCTS:
-						cts = true;
-						break;
-					case CipherPadding.X923PADDING:
-						padding = new X923Padding();
-						break;
-					case CipherPadding.ZEROBYTEPADDING:
-						padding = new ZeroBytePadding();
-						break;
-					default:
-						throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-				}
-			}
-
-			string mode = "";
-			if (parts.Length > 1)
-			{
-				mode = parts[1];
-
-				int di = GetDigitIndex(mode);
-				string modeName = di >= 0 ? mode.Substring(0, di) : mode;
-
-				try
-				{
-					CipherMode cipherMode = modeName == ""
-						? CipherMode.NONE
-						: (CipherMode)Enums.GetEnumValue(typeof(CipherMode), modeName);
-
-					switch (cipherMode)
-					{
-						case CipherMode.ECB:
-						case CipherMode.NONE:
-							break;
-						case CipherMode.CBC:
-							blockCipher = new CbcBlockCipher(blockCipher);
-							break;
-						case CipherMode.CCM:
-							aeadBlockCipher = new CcmBlockCipher(blockCipher);
-							break;
-						case CipherMode.CFB:
-						{
-							int bits = (di < 0)
-								?	8 * blockCipher.GetBlockSize()
-								:	int.Parse(mode.Substring(di));
-	
-							blockCipher = new CfbBlockCipher(blockCipher, bits);
-							break;
-						}
-						case CipherMode.CTR:
-							blockCipher = new SicBlockCipher(blockCipher);
-							break;
-						case CipherMode.CTS:
-							cts = true;
-							blockCipher = new CbcBlockCipher(blockCipher);
-							break;
-						case CipherMode.EAX:
-							aeadBlockCipher = new EaxBlockCipher(blockCipher);
-							break;
-						case CipherMode.GCM:
-							aeadBlockCipher = new GcmBlockCipher(blockCipher);
-							break;
-						case CipherMode.GOFB:
-							blockCipher = new GOfbBlockCipher(blockCipher);
-							break;
-						case CipherMode.OFB:
-						{
-							int bits = (di < 0)
-								?	8 * blockCipher.GetBlockSize()
-								:	int.Parse(mode.Substring(di));
-	
-							blockCipher = new OfbBlockCipher(blockCipher, bits);
-							break;
-						}
-						case CipherMode.OPENPGPCFB:
-							blockCipher = new OpenPgpCfbBlockCipher(blockCipher);
-							break;
-						case CipherMode.SIC:
-							if (blockCipher.GetBlockSize() < 16)
-							{
-								throw new ArgumentException("Warning: SIC-Mode can become a twotime-pad if the blocksize of the cipher is too small. Use a cipher with a block size of at least 128 bits (e.g. AES)");
-							}
-							blockCipher = new SicBlockCipher(blockCipher);
-							break;
-						default:
-							throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-					}
-				}
-				catch (ArgumentException)
-				{
-					throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-				}
-			}
-
-			if (aeadBlockCipher != null)
-			{
-				if (cts)
-					throw new SecurityUtilityException("CTS mode not valid for AEAD ciphers.");
-				if (padded && parts.Length > 2 && parts[2] != "")
-					throw new SecurityUtilityException("Bad padding specified for AEAD cipher.");
-
-				return new BufferedAeadBlockCipher(aeadBlockCipher);
-			}
-
-			if (blockCipher != null)
-			{
-				if (cts)
-				{
-					return new CtsBlockCipher(blockCipher);
-				}
-
-				if (padding != null)
-				{
-					return new PaddedBufferedBlockCipher(blockCipher, padding);
-				}
-
-				if (!padded || blockCipher.IsPartialBlockOkay)
-				{
-					return new BufferedBlockCipher(blockCipher);
-				}
-
-				return new PaddedBufferedBlockCipher(blockCipher);
-			}
-
-			if (asymBlockCipher != null)
-			{
-				return new BufferedAsymmetricBlockCipher(asymBlockCipher);
-			}
-
-			throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
-		}
-
-		public static string GetAlgorithmName(
-			DerObjectIdentifier oid)
-		{
-			return (string) algorithms[oid.Id];
-		}
-
-		private static int GetDigitIndex(
-			string s)
-		{
-			for (int i = 0; i < s.Length; ++i)
-			{
-				if (char.IsDigit(s[i]))
-					return i;
-			}
-
-			return -1;
-		}
-	}
+            algorithms["PBEWITHSHA1ANDDES"] = "PBEWITHSHA1ANDDES-CBC";
+            algorithms[PkcsObjectIdentifiers.PbeWithSha1AndDesCbc.Id] = "PBEWITHSHA1ANDDES-CBC";
+            algorithms["PBEWITHSHA1ANDRC2"] = "PBEWITHSHA1ANDRC2-CBC";
+            algorithms[PkcsObjectIdentifiers.PbeWithSha1AndRC2Cbc.Id] = "PBEWITHSHA1ANDRC2-CBC";
+
+            algorithms["PBEWITHSHA1AND3-KEYTRIPLEDES-CBC"] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
+            algorithms["PBEWITHSHAAND3KEYTRIPLEDES"] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
+            algorithms[PkcsObjectIdentifiers.PbeWithShaAnd3KeyTripleDesCbc.Id] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
+            algorithms["PBEWITHSHA1ANDDESEDE"] = "PBEWITHSHAAND3-KEYTRIPLEDES-CBC";
+
+            algorithms["PBEWITHSHA1AND2-KEYTRIPLEDES-CBC"] = "PBEWITHSHAAND2-KEYTRIPLEDES-CBC";
+            algorithms[PkcsObjectIdentifiers.PbeWithShaAnd2KeyTripleDesCbc.Id] = "PBEWITHSHAAND2-KEYTRIPLEDES-CBC";
+
+            algorithms["PBEWITHSHA1AND128BITRC2-CBC"] = "PBEWITHSHAAND128BITRC2-CBC";
+            algorithms[PkcsObjectIdentifiers.PbeWithShaAnd128BitRC2Cbc.Id] = "PBEWITHSHAAND128BITRC2-CBC";
+
+            algorithms["PBEWITHSHA1AND40BITRC2-CBC"] = "PBEWITHSHAAND40BITRC2-CBC";
+            algorithms[PkcsObjectIdentifiers.PbewithShaAnd40BitRC2Cbc.Id] = "PBEWITHSHAAND40BITRC2-CBC";
+
+            algorithms["PBEWITHSHA1AND128BITAES-CBC-BC"] = "PBEWITHSHAAND128BITAES-CBC-BC";
+            algorithms["PBEWITHSHA-1AND128BITAES-CBC-BC"] = "PBEWITHSHAAND128BITAES-CBC-BC";
+
+            algorithms["PBEWITHSHA1AND192BITAES-CBC-BC"] = "PBEWITHSHAAND192BITAES-CBC-BC";
+            algorithms["PBEWITHSHA-1AND192BITAES-CBC-BC"] = "PBEWITHSHAAND192BITAES-CBC-BC";
+
+            algorithms["PBEWITHSHA1AND256BITAES-CBC-BC"] = "PBEWITHSHAAND256BITAES-CBC-BC";
+            algorithms["PBEWITHSHA-1AND256BITAES-CBC-BC"] = "PBEWITHSHAAND256BITAES-CBC-BC";
+
+            algorithms["PBEWITHSHA-256AND128BITAES-CBC-BC"] = "PBEWITHSHA256AND128BITAES-CBC-BC";
+            algorithms["PBEWITHSHA-256AND192BITAES-CBC-BC"] = "PBEWITHSHA256AND192BITAES-CBC-BC";
+            algorithms["PBEWITHSHA-256AND256BITAES-CBC-BC"] = "PBEWITHSHA256AND256BITAES-CBC-BC";
+
+
+            algorithms["GOST"] = "GOST28147";
+            algorithms["GOST-28147"] = "GOST28147";
+            algorithms[CryptoProObjectIdentifiers.GostR28147Cbc.Id] = "GOST28147/CBC/PKCS7PADDING";
+
+            algorithms["RC5-32"] = "RC5";
+
+            algorithms[NttObjectIdentifiers.IdCamellia128Cbc.Id] = "CAMELLIA/CBC/PKCS7PADDING";
+            algorithms[NttObjectIdentifiers.IdCamellia192Cbc.Id] = "CAMELLIA/CBC/PKCS7PADDING";
+            algorithms[NttObjectIdentifiers.IdCamellia256Cbc.Id] = "CAMELLIA/CBC/PKCS7PADDING";
+
+            algorithms[KisaObjectIdentifiers.IdSeedCbc.Id] = "SEED/CBC/PKCS7PADDING";
+
+            algorithms["1.3.6.1.4.1.3029.1.2"] = "BLOWFISH/CBC";
+        }
+
+        private CipherUtilities()
+        {
+        }
+
+        /// <summary>
+        /// Returns a ObjectIdentifier for a give encoding.
+        /// </summary>
+        /// <param name="mechanism">A string representation of the encoding.</param>
+        /// <returns>A DerObjectIdentifier, null if the Oid is not available.</returns>
+        // TODO Don't really want to support this
+        public static DerObjectIdentifier GetObjectIdentifier(
+            string mechanism)
+        {
+            if (mechanism == null)
+                throw new ArgumentNullException("mechanism");
+
+            mechanism = Platform.ToUpperInvariant(mechanism);
+            string aliased = (string) algorithms[mechanism];
+
+            if (aliased != null)
+                mechanism = aliased;
+
+            return (DerObjectIdentifier) oids[mechanism];
+        }
+
+        public static ICollection Algorithms
+        {
+            get { return oids.Keys; }
+        }
+
+        public static IBufferedCipher GetCipher(
+            DerObjectIdentifier oid)
+        {
+            return GetCipher(oid.Id);
+        }
+
+        public static IBufferedCipher GetCipher(
+            string algorithm)
+        {
+            if (algorithm == null)
+                throw new ArgumentNullException("algorithm");
+
+            algorithm = Platform.ToUpperInvariant(algorithm);
+
+            {
+                string aliased = (string) algorithms[algorithm];
+
+                if (aliased != null)
+                    algorithm = aliased;
+            }
+
+            IBasicAgreement iesAgreement = null;
+            if (algorithm == "IES")
+            {
+                iesAgreement = new DHBasicAgreement();
+            }
+            else if (algorithm == "ECIES")
+            {
+                iesAgreement = new ECDHBasicAgreement();
+            }
+
+            if (iesAgreement != null)
+            {
+                return new BufferedIesCipher(
+                    new IesEngine(
+                    iesAgreement,
+                    new Kdf2BytesGenerator(
+                    new Sha1Digest()),
+                    new HMac(
+                    new Sha1Digest())));
+            }
+
+
+
+            if (algorithm.StartsWith("PBE"))
+            {
+                if (algorithm.EndsWith("-CBC"))
+                {
+                    if (algorithm == "PBEWITHSHA1ANDDES-CBC")
+                    {
+                        return new PaddedBufferedBlockCipher(
+                            new CbcBlockCipher(new DesEngine()));
+                    }
+                    else if (algorithm == "PBEWITHSHA1ANDRC2-CBC")
+                    {
+                        return new PaddedBufferedBlockCipher(
+                            new CbcBlockCipher(new RC2Engine()));
+                    }
+                    else if (Strings.IsOneOf(algorithm,
+                        "PBEWITHSHAAND2-KEYTRIPLEDES-CBC", "PBEWITHSHAAND3-KEYTRIPLEDES-CBC"))
+                    {
+                        return new PaddedBufferedBlockCipher(
+                            new CbcBlockCipher(new DesEdeEngine()));
+                    }
+                    else if (Strings.IsOneOf(algorithm,
+                        "PBEWITHSHAAND128BITRC2-CBC", "PBEWITHSHAAND40BITRC2-CBC"))
+                    {
+                        return new PaddedBufferedBlockCipher(
+                            new CbcBlockCipher(new RC2Engine()));
+                    }
+                }
+                else if (algorithm.EndsWith("-BC") || algorithm.EndsWith("-OPENSSL"))
+                {
+                    if (Strings.IsOneOf(algorithm,
+                        "PBEWITHSHAAND128BITAES-CBC-BC",
+                        "PBEWITHSHAAND192BITAES-CBC-BC",
+                        "PBEWITHSHAAND256BITAES-CBC-BC",
+                        "PBEWITHSHA256AND128BITAES-CBC-BC",
+                        "PBEWITHSHA256AND192BITAES-CBC-BC",
+                        "PBEWITHSHA256AND256BITAES-CBC-BC",
+                        "PBEWITHMD5AND128BITAES-CBC-OPENSSL",
+                        "PBEWITHMD5AND192BITAES-CBC-OPENSSL",
+                        "PBEWITHMD5AND256BITAES-CBC-OPENSSL"))
+                    {
+                        return new PaddedBufferedBlockCipher(
+                            new CbcBlockCipher(new AesFastEngine()));
+                    }
+                }
+            }
+
+
+
+            string[] parts = algorithm.Split('/');
+
+            IBlockCipher blockCipher = null;
+            IAsymmetricBlockCipher asymBlockCipher = null;
+            IStreamCipher streamCipher = null;
+
+            string algorithmName = parts[0];
+
+            {
+                string aliased = (string)algorithms[algorithmName];
+
+                if (aliased != null)
+                    algorithmName = aliased;
+            }
+
+            CipherAlgorithm cipherAlgorithm;
+            try
+            {
+                cipherAlgorithm = (CipherAlgorithm)Enums.GetEnumValue(typeof(CipherAlgorithm), algorithmName);
+            }
+            catch (ArgumentException)
+            {
+                throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+            }
+
+            switch (cipherAlgorithm)
+            {
+                case CipherAlgorithm.AES:
+                    blockCipher = new AesFastEngine();
+                    break;
+                case CipherAlgorithm.ARC4:
+                    streamCipher = new RC4Engine();
+                    break;
+                case CipherAlgorithm.BLOWFISH:
+                    blockCipher = new BlowfishEngine();
+                    break;
+                case CipherAlgorithm.CAMELLIA:
+                    blockCipher = new CamelliaEngine();
+                    break;
+                case CipherAlgorithm.CAST5:
+                    blockCipher = new Cast5Engine();
+                    break;
+                case CipherAlgorithm.CAST6:
+                    blockCipher = new Cast6Engine();
+                    break;
+                case CipherAlgorithm.DES:
+                    blockCipher = new DesEngine();
+                    break;
+                case CipherAlgorithm.DESEDE:
+                    blockCipher = new DesEdeEngine();
+                    break;
+                case CipherAlgorithm.ELGAMAL:
+                    asymBlockCipher = new ElGamalEngine();
+                    break;
+                case CipherAlgorithm.GOST28147:
+                    blockCipher = new Gost28147Engine();
+                    break;
+                case CipherAlgorithm.HC128:
+                    streamCipher = new HC128Engine();
+                    break;
+                case CipherAlgorithm.HC256:
+                    streamCipher = new HC256Engine();
+                    break;
+                case CipherAlgorithm.IDEA:
+                    blockCipher = new IdeaEngine();
+                    break;
+                case CipherAlgorithm.NOEKEON:
+                    blockCipher = new NoekeonEngine();
+                    break;
+                case CipherAlgorithm.PBEWITHSHAAND128BITRC4:
+                case CipherAlgorithm.PBEWITHSHAAND40BITRC4:
+                    streamCipher = new RC4Engine();
+                    break;
+                case CipherAlgorithm.RC2:
+                    blockCipher = new RC2Engine();
+                    break;
+                case CipherAlgorithm.RC5:
+                    blockCipher = new RC532Engine();
+                    break;
+                case CipherAlgorithm.RC5_64:
+                    blockCipher = new RC564Engine();
+                    break;
+                case CipherAlgorithm.RC6:
+                    blockCipher = new RC6Engine();
+                    break;
+                case CipherAlgorithm.RIJNDAEL:
+                    blockCipher = new RijndaelEngine();
+                    break;
+                case CipherAlgorithm.RSA:
+                    asymBlockCipher = new RsaBlindedEngine();
+                    break;
+                case CipherAlgorithm.SALSA20:
+                    streamCipher = new Salsa20Engine();
+                    break;
+                case CipherAlgorithm.SEED:
+                    blockCipher = new SeedEngine();
+                    break;
+                case CipherAlgorithm.SERPENT:
+                    blockCipher = new SerpentEngine();
+                    break;
+                case CipherAlgorithm.SKIPJACK:
+                    blockCipher = new SkipjackEngine();
+                    break;
+                case CipherAlgorithm.TEA:
+                    blockCipher = new TeaEngine();
+                    break;
+                case CipherAlgorithm.TWOFISH:
+                    blockCipher = new TwofishEngine();
+                    break;
+                case CipherAlgorithm.VMPC:
+                    streamCipher = new VmpcEngine();
+                    break;
+                case CipherAlgorithm.VMPC_KSA3:
+                    streamCipher = new VmpcKsa3Engine();
+                    break;
+                case CipherAlgorithm.XTEA:
+                    blockCipher = new XteaEngine();
+                    break;
+                default:
+                    throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+            }
+
+            if (streamCipher != null)
+            {
+                if (parts.Length > 1)
+                    throw new ArgumentException("Modes and paddings not used for stream ciphers");
+
+                return new BufferedStreamCipher(streamCipher);
+            }
+
+
+            bool cts = false;
+            bool padded = true;
+            IBlockCipherPadding padding = null;
+            IAeadBlockCipher aeadBlockCipher = null;
+
+            if (parts.Length > 2)
+            {
+                if (streamCipher != null)
+                    throw new ArgumentException("Paddings not used for stream ciphers");
+
+                string paddingName = parts[2];
+
+                CipherPadding cipherPadding;
+                if (paddingName == "")
+                {
+                    cipherPadding = CipherPadding.RAW;
+                }
+                else if (paddingName == "X9.23PADDING")
+                {
+                    cipherPadding = CipherPadding.X923PADDING;
+                }
+                else
+                {
+                    try
+                    {
+                        cipherPadding = (CipherPadding)Enums.GetEnumValue(typeof(CipherPadding), paddingName);
+                    }
+                    catch (ArgumentException)
+                    {
+                        throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+                    }
+                }
+
+                switch (cipherPadding)
+                {
+                    case CipherPadding.NOPADDING:
+                        padded = false;
+                        break;
+                    case CipherPadding.RAW:
+                        break;
+                    case CipherPadding.ISO10126PADDING:
+                    case CipherPadding.ISO10126D2PADDING:
+                    case CipherPadding.ISO10126_2PADDING:
+                        padding = new ISO10126d2Padding();
+                        break;
+                    case CipherPadding.ISO7816_4PADDING:
+                    case CipherPadding.ISO9797_1PADDING:
+                        padding = new ISO7816d4Padding();
+                        break;
+                    case CipherPadding.ISO9796_1:
+                    case CipherPadding.ISO9796_1PADDING:
+                        asymBlockCipher = new ISO9796d1Encoding(asymBlockCipher);
+                        break;
+                    case CipherPadding.OAEP:
+                    case CipherPadding.OAEPPADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher);
+                        break;
+                    case CipherPadding.OAEPWITHMD5ANDMGF1PADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher, new MD5Digest());
+                        break;
+                    case CipherPadding.OAEPWITHSHA1ANDMGF1PADDING:
+                    case CipherPadding.OAEPWITHSHA_1ANDMGF1PADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha1Digest());
+                        break;
+                    case CipherPadding.OAEPWITHSHA224ANDMGF1PADDING:
+                    case CipherPadding.OAEPWITHSHA_224ANDMGF1PADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha224Digest());
+                        break;
+                    case CipherPadding.OAEPWITHSHA256ANDMGF1PADDING:
+                    case CipherPadding.OAEPWITHSHA_256ANDMGF1PADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha256Digest());
+                        break;
+                    case CipherPadding.OAEPWITHSHA384ANDMGF1PADDING:
+                    case CipherPadding.OAEPWITHSHA_384ANDMGF1PADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha384Digest());
+                        break;
+                    case CipherPadding.OAEPWITHSHA512ANDMGF1PADDING:
+                    case CipherPadding.OAEPWITHSHA_512ANDMGF1PADDING:
+                        asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha512Digest());
+                        break;
+                    case CipherPadding.PKCS1:
+                    case CipherPadding.PKCS1PADDING:
+                        asymBlockCipher = new Pkcs1Encoding(asymBlockCipher);
+                        break;
+                    case CipherPadding.PKCS5:
+                    case CipherPadding.PKCS5PADDING:
+                    case CipherPadding.PKCS7:
+                    case CipherPadding.PKCS7PADDING:
+                        padding = new Pkcs7Padding();
+                        break;
+                    case CipherPadding.TBCPADDING:
+                        padding = new TbcPadding();
+                        break;
+                    case CipherPadding.WITHCTS:
+                        cts = true;
+                        break;
+                    case CipherPadding.X923PADDING:
+                        padding = new X923Padding();
+                        break;
+                    case CipherPadding.ZEROBYTEPADDING:
+                        padding = new ZeroBytePadding();
+                        break;
+                    default:
+                        throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+                }
+            }
+
+            string mode = "";
+            if (parts.Length > 1)
+            {
+                mode = parts[1];
+
+                int di = GetDigitIndex(mode);
+                string modeName = di >= 0 ? mode.Substring(0, di) : mode;
+
+                try
+                {
+                    CipherMode cipherMode = modeName == ""
+                        ? CipherMode.NONE
+                        : (CipherMode)Enums.GetEnumValue(typeof(CipherMode), modeName);
+
+                    switch (cipherMode)
+                    {
+                        case CipherMode.ECB:
+                        case CipherMode.NONE:
+                            break;
+                        case CipherMode.CBC:
+                            blockCipher = new CbcBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.CCM:
+                            aeadBlockCipher = new CcmBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.CFB:
+                        {
+                            int bits = (di < 0)
+                                ?	8 * blockCipher.GetBlockSize()
+                                :	int.Parse(mode.Substring(di));
+    
+                            blockCipher = new CfbBlockCipher(blockCipher, bits);
+                            break;
+                        }
+                        case CipherMode.CTR:
+                            blockCipher = new SicBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.CTS:
+                            cts = true;
+                            blockCipher = new CbcBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.EAX:
+                            aeadBlockCipher = new EaxBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.GCM:
+                            aeadBlockCipher = new GcmBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.GOFB:
+                            blockCipher = new GOfbBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.OCB:
+                            aeadBlockCipher = new OcbBlockCipher(blockCipher, CreateBlockCipher(cipherAlgorithm));
+                            break;
+                        case CipherMode.OFB:
+                        {
+                            int bits = (di < 0)
+                                ?	8 * blockCipher.GetBlockSize()
+                                :	int.Parse(mode.Substring(di));
+    
+                            blockCipher = new OfbBlockCipher(blockCipher, bits);
+                            break;
+                        }
+                        case CipherMode.OPENPGPCFB:
+                            blockCipher = new OpenPgpCfbBlockCipher(blockCipher);
+                            break;
+                        case CipherMode.SIC:
+                            if (blockCipher.GetBlockSize() < 16)
+                            {
+                                throw new ArgumentException("Warning: SIC-Mode can become a twotime-pad if the blocksize of the cipher is too small. Use a cipher with a block size of at least 128 bits (e.g. AES)");
+                            }
+                            blockCipher = new SicBlockCipher(blockCipher);
+                            break;
+                        default:
+                            throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+                }
+            }
+
+            if (aeadBlockCipher != null)
+            {
+                if (cts)
+                    throw new SecurityUtilityException("CTS mode not valid for AEAD ciphers.");
+                if (padded && parts.Length > 2 && parts[2] != "")
+                    throw new SecurityUtilityException("Bad padding specified for AEAD cipher.");
+
+                return new BufferedAeadBlockCipher(aeadBlockCipher);
+            }
+
+            if (blockCipher != null)
+            {
+                if (cts)
+                {
+                    return new CtsBlockCipher(blockCipher);
+                }
+
+                if (padding != null)
+                {
+                    return new PaddedBufferedBlockCipher(blockCipher, padding);
+                }
+
+                if (!padded || blockCipher.IsPartialBlockOkay)
+                {
+                    return new BufferedBlockCipher(blockCipher);
+                }
+
+                return new PaddedBufferedBlockCipher(blockCipher);
+            }
+
+            if (asymBlockCipher != null)
+            {
+                return new BufferedAsymmetricBlockCipher(asymBlockCipher);
+            }
+
+            throw new SecurityUtilityException("Cipher " + algorithm + " not recognised.");
+        }
+
+        public static string GetAlgorithmName(
+            DerObjectIdentifier oid)
+        {
+            return (string) algorithms[oid.Id];
+        }
+
+        private static int GetDigitIndex(
+            string s)
+        {
+            for (int i = 0; i < s.Length; ++i)
+            {
+                if (char.IsDigit(s[i]))
+                    return i;
+            }
+
+            return -1;
+        }
+
+        private static IBlockCipher CreateBlockCipher(CipherAlgorithm cipherAlgorithm)
+        {
+            switch (cipherAlgorithm)
+            {
+                case CipherAlgorithm.AES: return new AesFastEngine();
+                case CipherAlgorithm.BLOWFISH: return new BlowfishEngine();
+                case CipherAlgorithm.CAMELLIA: return new CamelliaEngine();
+                case CipherAlgorithm.CAST5: return new Cast5Engine();
+                case CipherAlgorithm.CAST6: return new Cast6Engine();
+                case CipherAlgorithm.DES: return new DesEngine();
+                case CipherAlgorithm.DESEDE: return new DesEdeEngine();
+                case CipherAlgorithm.GOST28147: return new Gost28147Engine();
+                case CipherAlgorithm.IDEA: return new IdeaEngine();
+                case CipherAlgorithm.NOEKEON: return new NoekeonEngine();
+                case CipherAlgorithm.RC2: return new RC2Engine();
+                case CipherAlgorithm.RC5: return new RC532Engine();
+                case CipherAlgorithm.RC5_64: return new RC564Engine();
+                case CipherAlgorithm.RC6: return new RC6Engine();
+                case CipherAlgorithm.RIJNDAEL: return new RijndaelEngine();
+                case CipherAlgorithm.SEED: return new SeedEngine();
+                case CipherAlgorithm.SERPENT: return new SerpentEngine();
+                case CipherAlgorithm.SKIPJACK: return new SkipjackEngine();
+                case CipherAlgorithm.TEA: return new TeaEngine();
+                case CipherAlgorithm.TWOFISH: return new TwofishEngine();
+                case CipherAlgorithm.XTEA: return new XteaEngine();
+                default:
+                    throw new SecurityUtilityException("Cipher " + cipherAlgorithm + " not recognised or not a block cipher");
+            }
+        }
+    }
 }