diff --git a/crypto/crypto.csproj b/crypto/crypto.csproj
index 5a9d37797..6539d2f9f 100644
--- a/crypto/crypto.csproj
+++ b/crypto/crypto.csproj
@@ -10657,6 +10657,11 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "test\src\math\ec\test\ECAlgorithmsTest.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "test\src\math\ec\test\ECPointTest.cs"
SubType = "Code"
BuildAction = "Compile"
diff --git a/crypto/test/src/math/ec/test/AllTests.cs b/crypto/test/src/math/ec/test/AllTests.cs
index f5d7d2249..d4c7dc768 100644
--- a/crypto/test/src/math/ec/test/AllTests.cs
+++ b/crypto/test/src/math/ec/test/AllTests.cs
@@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Math.EC.Tests
public class AllTests
{
public static void Main(
- string[] args)
+ string[] args)
{
// junit.textui.TestRunner.run(suite());
EventListener el = new NullListener();
@@ -17,11 +17,12 @@ namespace Org.BouncyCastle.Math.EC.Tests
public static TestSuite suite()
{
- TestSuite suite = new TestSuite("EC Math tests");
+ TestSuite suite = new TestSuite("EC Math tests");
- suite.Add(new ECPointTest());
+ suite.Add(new ECAlgorithmsTest());
+ suite.Add(new ECPointTest());
- return suite;
+ return suite;
}
}
}
diff --git a/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs b/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs
new file mode 100644
index 000000000..a5d4abcd8
--- /dev/null
+++ b/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+using Org.BouncyCastle.Asn1.X9;
+using Org.BouncyCastle.Crypto.EC;
+using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Security;
+using Org.BouncyCastle.Utilities;
+using Org.BouncyCastle.Utilities.Collections;
+
+namespace Org.BouncyCastle.Math.EC.Tests
+{
+ [TestFixture]
+ public class ECAlgorithmsTest
+ {
+ private const int SCALE = 8;
+ private static readonly SecureRandom RND = new SecureRandom();
+
+ [Test]
+ public void TestSumOfMultiplies()
+ {
+ foreach (X9ECParameters x9 in GetTestCurves())
+ {
+ ECPoint[] points = new ECPoint[SCALE];
+ BigInteger[] scalars = new BigInteger[SCALE];
+ for (int i = 0; i < SCALE; ++i)
+ {
+ points[i] = GetRandomPoint(x9);
+ scalars[i] = GetRandomScalar(x9);
+ }
+
+ ECPoint u = x9.Curve.Infinity;
+ for (int i = 0; i < SCALE; ++i)
+ {
+ u = u.Add(points[i].Multiply(scalars[i]));
+
+ ECPoint v = ECAlgorithms.SumOfMultiplies(CopyPoints(points, i + 1), CopyScalars(scalars, i + 1));
+
+ ECPoint[] results = new ECPoint[] { u, v };
+ x9.Curve.NormalizeAll(results);
+
+ AssertPointsEqual("ECAlgorithms.SumOfMultiplies is incorrect", results[0], results[1]);
+ }
+ }
+ }
+
+ [Test]
+ public void TestSumOfTwoMultiplies()
+ {
+ foreach (X9ECParameters x9 in GetTestCurves())
+ {
+ ECPoint p = GetRandomPoint(x9);
+ BigInteger a = GetRandomScalar(x9);
+
+ for (int i = 0; i < SCALE; ++i)
+ {
+ ECPoint q = GetRandomPoint(x9);
+ BigInteger b = GetRandomScalar(x9);
+
+ ECPoint u = p.Multiply(a).Add(q.Multiply(b));
+ ECPoint v = ECAlgorithms.ShamirsTrick(p, a, q, b);
+ ECPoint w = ECAlgorithms.SumOfTwoMultiplies(p, a, q, b);
+
+ ECPoint[] results = new ECPoint[] { u, v, w };
+ x9.Curve.NormalizeAll(results);
+
+ AssertPointsEqual("ECAlgorithms.ShamirsTrick is incorrect", results[0], results[1]);
+ AssertPointsEqual("ECAlgorithms.SumOfTwoMultiplies is incorrect", results[0], results[2]);
+
+ p = q;
+ a = b;
+ }
+ }
+ }
+
+ private void AssertPointsEqual(string message, ECPoint a, ECPoint b)
+ {
+ Assert.AreEqual(a, b, message);
+ }
+
+ private ECPoint[] CopyPoints(ECPoint[] ps, int len)
+ {
+ ECPoint[] result = new ECPoint[len];
+ Array.Copy(ps, 0, result, 0, len);
+ return result;
+ }
+
+ private BigInteger[] CopyScalars(BigInteger[] ks, int len)
+ {
+ BigInteger[] result = new BigInteger[len];
+ Array.Copy(ks, 0, result, 0, len);
+ return result;
+ }
+
+ private ECPoint GetRandomPoint(X9ECParameters x9)
+ {
+ return x9.G.Multiply(GetRandomScalar(x9));
+ }
+
+ private BigInteger GetRandomScalar(X9ECParameters x9)
+ {
+ return new BigInteger(x9.N.BitLength, RND);
+ }
+
+ private IList GetTestCurves()
+ {
+ ArrayList x9s = new ArrayList();
+ ArrayList names = new ArrayList();
+ CollectionUtilities.AddRange(names, ECNamedCurveTable.Names);
+ CollectionUtilities.AddRange(names, CustomNamedCurves.Names);
+ foreach (string name in names)
+ {
+ X9ECParameters x9 = ECNamedCurveTable.GetByName(name);
+ if (x9 != null)
+ {
+ AddTestCurves(x9s, x9);
+ }
+
+ x9 = CustomNamedCurves.GetByName(name);
+ if (x9 != null)
+ {
+ AddTestCurves(x9s, x9);
+ }
+ }
+ return x9s;
+ }
+
+ private void AddTestCurves(IList x9s, X9ECParameters x9)
+ {
+ ECCurve curve = x9.Curve;
+
+ int[] coords = ECCurve.GetAllCoordinateSystems();
+ for (int i = 0; i < coords.Length; ++i)
+ {
+ int coord = coords[i];
+ if (curve.CoordinateSystem == coord)
+ {
+ x9s.Add(x9);
+ }
+ else if (curve.SupportsCoordinateSystem(coord))
+ {
+ ECCurve c = curve.Configure().SetCoordinateSystem(coord).Create();
+ x9s.Add(new X9ECParameters(c, c.ImportPoint(x9.G), x9.N, x9.H));
+ }
+ }
+ }
+ }
+}
diff --git a/crypto/test/src/math/ec/test/ECPointTest.cs b/crypto/test/src/math/ec/test/ECPointTest.cs
index 4bad914fd..1a23e0bc7 100644
--- a/crypto/test/src/math/ec/test/ECPointTest.cs
+++ b/crypto/test/src/math/ec/test/ECPointTest.cs
@@ -530,7 +530,7 @@ namespace Org.BouncyCastle.Math.EC.Tests
private void AssertPointsEqual(string message, ECPoint a, ECPoint b)
{
- Assert.AreEqual(a, b, message);
+ Assert.AreEqual(a, b, message);
}
}
}
|
