X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_curves.c;h=d215fe4387bd087643e1720ba829aa4f3a38775a;hb=d798e0186d61549dcbe74c3e83c4b2316e70bed7;hp=1ee15b0fab706e665f53258a5ac1f4799b18d463;hpb=e73b5da38fe3e541d076093f7dd96fd2f8f527cc;p=openssl-gost%2Fengine.git

diff --git a/test_curves.c b/test_curves.c
index 1ee15b0..d215fe4 100644
--- a/test_curves.c
+++ b/test_curves.c
@@ -43,28 +43,19 @@ struct test_curve {
 static struct test_curve test_curves[] = {
 #if 2001
     { NID_id_GostR3410_2001_TestParamSet, },
+#endif
     { NID_id_GostR3410_2001_CryptoPro_A_ParamSet },
     { NID_id_GostR3410_2001_CryptoPro_B_ParamSet },
     { NID_id_GostR3410_2001_CryptoPro_C_ParamSet },
     { NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet },
     { NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet },
-#endif
-    {
-	NID_id_tc26_gost_3410_2012_512_paramSetA,
-	"id-tc26-gost-3410-2012-512-paramSetA",
-    },
-    {
-	NID_id_tc26_gost_3410_2012_512_paramSetB,
-	"id-tc26-gost-3410-2012-512-paramSetB",
-    },
-    {
-	NID_id_tc26_gost_3410_2012_512_paramSetC,
-	"id-tc26-gost-3410-2012-512-paramSetC",
-    },
-    {
-	NID_id_tc26_gost_3410_2012_256_paramSetA,
-	"id-tc26-gost-3410-2012-256-paramSetA",
-    },
+    { NID_id_tc26_gost_3410_2012_512_paramSetA, "id-tc26-gost-3410-2012-512-paramSetA", },
+    { NID_id_tc26_gost_3410_2012_512_paramSetB, "id-tc26-gost-3410-2012-512-paramSetB", },
+    { NID_id_tc26_gost_3410_2012_512_paramSetC, "id-tc26-gost-3410-2012-512-paramSetC", },
+    { NID_id_tc26_gost_3410_2012_256_paramSetA, "id-tc26-gost-3410-2012-256-paramSetA", },
+    { NID_id_tc26_gost_3410_2012_256_paramSetB, "id-tc26-gost-3410-2012-256-paramSetB", },
+    { NID_id_tc26_gost_3410_2012_256_paramSetC, "id-tc26-gost-3410-2012-256-paramSetC", },
+    { NID_id_tc26_gost_3410_2012_256_paramSetD, "id-tc26-gost-3410-2012-256-paramSetD", },
     0,
 };
 
@@ -200,6 +191,7 @@ static int parameter_test(struct test_curve *tc)
     BN_add(k2, k2, order);
     T(EC_POINT_mul(group, p1, NULL, generator, k1, ctx));
     T(EC_POINT_mul(group, p2, NULL, generator, k2, ctx));
+    T(EC_POINT_cmp(group, p1, p2, ctx) == 0);
 
     /* Cofactor is 1 or 4 */
     const BIGNUM *c;