changed ECPointTest to use a larger q.

Author: dghgit

core/src/main/java/org/bouncycastle/math/ec/ECCurve.java

@@ -716,8 +716,8 @@ else if (knownQs.contains(q) || validatedQs.contains(q))
                 {
                     throw new IllegalArgumentException("Fp q value out of range");
                 }
-                // TODO: need to fix ECPointsTest
-                if (/* Primes.hasAnySmallFactors(q) ||*/ !Primes.isMRProbablePrime(
+
+                if (Primes.hasAnySmallFactors(q) || !Primes.isMRProbablePrime(
                     q, CryptoServicesRegistrar.getSecureRandom(), getNumberOfIterations(qBitLength, certainty)))
                 {
                     throw new IllegalArgumentException("Fp q value not prime");

core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java

@@ -10,6 +10,9 @@
 import java.util.Random;
 import java.util.Set;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 import org.bouncycastle.asn1.x9.ECNamedCurveTable;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.asn1.x9.X9ECPoint;
@@ -25,10 +28,6 @@
 import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.encoders.Hex;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 /**
  * Test class for {@link org.bouncycastle.math.ec.ECPoint ECPoint}. All
  * literature values are taken from "Guide to elliptic curve cryptography",
@@ -51,7 +50,7 @@ public class ECPointTest extends TestCase
      */
     public static class Fp
     {
-        private final BigInteger q = new BigInteger("29");
+        private final BigInteger q = new BigInteger("1063");
 
         private final BigInteger a = new BigInteger("4");
 
@@ -65,7 +64,7 @@ public static class Fp
 
         private final ECPoint infinity = curve.getInfinity();
 
-        private final int[] pointSource = { 5, 22, 16, 27, 13, 6, 14, 6 };
+        private final int[] pointSource = { 1, 5, 4, 10, 234, 1024, 817, 912 };
 
         private ECPoint[] p = new ECPoint[pointSource.length / 2];