summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2018-04-17 13:45:16 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2018-04-17 13:45:16 +0700
commit4a6df7720d0a5faa8d1501b28762f6ba4fcd0f53 (patch)
treec5f92dcc8e1b88f820eb32e65e4a0b0b6108b4d2
parentRemove debugging code (diff)
downloadBouncyCastle.NET-ed25519-4a6df7720d0a5faa8d1501b28762f6ba4fcd0f53.tar.xz
Update TSP algorithms from bc-java
-rw-r--r--crypto/src/tsp/TSPAlgorithms.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/crypto/src/tsp/TSPAlgorithms.cs b/crypto/src/tsp/TSPAlgorithms.cs
index e3dfc7916..928468ed7 100644
--- a/crypto/src/tsp/TSPAlgorithms.cs
+++ b/crypto/src/tsp/TSPAlgorithms.cs
@@ -1,9 +1,11 @@
 using System.Collections;
 
 using Org.BouncyCastle.Asn1.CryptoPro;
+using Org.BouncyCastle.Asn1.GM;
 using Org.BouncyCastle.Asn1.Nist;
 using Org.BouncyCastle.Asn1.Oiw;
 using Org.BouncyCastle.Asn1.Pkcs;
+using Org.BouncyCastle.Asn1.Rosstandart;
 using Org.BouncyCastle.Asn1.TeleTrust;
 using Org.BouncyCastle.Utilities;
 
@@ -28,14 +30,18 @@ namespace Org.BouncyCastle.Tsp
 		public static readonly string RipeMD256 = TeleTrusTObjectIdentifiers.RipeMD256.Id;
 
 		public static readonly string Gost3411 = CryptoProObjectIdentifiers.GostR3411.Id;
+        public static readonly string Gost3411_2012_256 = RosstandartObjectIdentifiers.id_tc26_gost_3411_12_256.Id;
+        public static readonly string Gost3411_2012_512 = RosstandartObjectIdentifiers.id_tc26_gost_3411_12_512.Id;
 
-		public static readonly IList Allowed;
+        public static readonly string SM3 = GMObjectIdentifiers.sm3.Id;
+
+        public static readonly IList Allowed;
 
 		static TspAlgorithms()
 		{
 			string[] algs = new string[]
 			{
-				Gost3411, MD5, Sha1, Sha224, Sha256, Sha384, Sha512, RipeMD128, RipeMD160, RipeMD256
+				Gost3411, Gost3411_2012_256, Gost3411_2012_512, MD5, RipeMD128, RipeMD160, RipeMD256, Sha1, Sha224, Sha256, Sha384, Sha512, SM3
 			};
 
 			Allowed = Platform.CreateArrayList();