diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2022-06-29 14:15:10 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2022-06-29 14:15:10 +0700 |
| commit | 435210f10fd927653ce8fbc04ec537ae5d8966b6 (patch) | |
| tree | 27b6ed1c029db271c3429ac57629d7f0156c5fed /crypto/test/src/math | |
| parent | Refactoring around Platform (diff) | |
| download | BouncyCastle.NET-ed25519-435210f10fd927653ce8fbc04ec537ae5d8966b6.tar.xz | |
Generics migration complete
Diffstat (limited to 'crypto/test/src/math')
| -rw-r--r-- | crypto/test/src/math/ec/test/ECAlgorithmsTest.cs | 13 | ||||
| -rw-r--r-- | crypto/test/src/math/ec/test/ECPointPerformanceTest.cs | 2 | ||||
| -rw-r--r-- | crypto/test/src/math/ec/test/ECPointTest.cs | 3 | ||||
| -rw-r--r-- | crypto/test/src/math/ec/test/FixedPointTest.cs | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs b/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs index dbbd0a328..419b022a7 100644 --- a/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs +++ b/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs @@ -1,12 +1,11 @@ using System; -using System.Collections; +using System.Collections.Generic; using NUnit.Framework; using Org.BouncyCastle.Asn1.X9; using Org.BouncyCastle.Crypto.EC; using Org.BouncyCastle.Security; -using Org.BouncyCastle.Utilities.Collections; namespace Org.BouncyCastle.Math.EC.Tests { @@ -128,12 +127,12 @@ namespace Org.BouncyCastle.Math.EC.Tests return new BigInteger(x9.N.BitLength, Random); } - private IList GetTestCurves() + private IList<X9ECParameters> GetTestCurves() { - ArrayList x9s = new ArrayList(); - ISet names = new HashSet(ECNamedCurveTable.Names); - names.AddAll(CustomNamedCurves.Names); + var names = new HashSet<string>(ECNamedCurveTable.Names); + names.UnionWith(CustomNamedCurves.Names); + var x9s = new List<X9ECParameters>(); foreach (string name in names) { X9ECParameters x9 = ECNamedCurveTable.GetByName(name); @@ -151,7 +150,7 @@ namespace Org.BouncyCastle.Math.EC.Tests return x9s; } - private void AddTestCurves(IList x9s, X9ECParameters x9) + private void AddTestCurves(IList<X9ECParameters> x9s, X9ECParameters x9) { ECCurve curve = x9.Curve; diff --git a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs b/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs index 059416427..18051226b 100644 --- a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs +++ b/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs @@ -179,7 +179,7 @@ namespace Org.BouncyCastle.Math.EC.Tests names.Sort(); - ISet oids = new HashSet(); + var oids = new HashSet<DerObjectIdentifier>(); foreach (string name in names) { DerObjectIdentifier oid = ECNamedCurveTable.GetOid(name); diff --git a/crypto/test/src/math/ec/test/ECPointTest.cs b/crypto/test/src/math/ec/test/ECPointTest.cs index 4e3fc5832..7a833a413 100644 --- a/crypto/test/src/math/ec/test/ECPointTest.cs +++ b/crypto/test/src/math/ec/test/ECPointTest.cs @@ -7,7 +7,6 @@ using Org.BouncyCastle.Asn1.X9; using Org.BouncyCastle.Crypto.EC; using Org.BouncyCastle.Security; using Org.BouncyCastle.Utilities; -using Org.BouncyCastle.Utilities.Collections; using Org.BouncyCastle.Utilities.Encoders; namespace Org.BouncyCastle.Math.EC.Tests @@ -538,7 +537,7 @@ namespace Org.BouncyCastle.Math.EC.Tests names.AddRange(ECNamedCurveTable.Names); names.AddRange(CustomNamedCurves.Names); - ISet uniqNames = new HashSet(names); + var uniqNames = new HashSet<string>(names); foreach (string name in uniqNames) { diff --git a/crypto/test/src/math/ec/test/FixedPointTest.cs b/crypto/test/src/math/ec/test/FixedPointTest.cs index 433f956da..bc90bdfc3 100644 --- a/crypto/test/src/math/ec/test/FixedPointTest.cs +++ b/crypto/test/src/math/ec/test/FixedPointTest.cs @@ -27,7 +27,7 @@ namespace Org.BouncyCastle.Math.EC.Tests names.AddRange(ECNamedCurveTable.Names); names.AddRange(CustomNamedCurves.Names); - ISet uniqNames = new HashSet(names); + var uniqNames = new HashSet<string>(names); foreach (string name in uniqNames) { |