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,
};
const BIGNUM *order;
T(order = EC_GROUP_get0_order(group));
T(!BN_is_zero(order));
- print_bn("m", order);
- T(!BN_is_zero(order));
+ print_bn("q", order);
+ T(BN_is_odd(order));
EC_POINT *point;
T((point = EC_POINT_new(group)));
T(EC_POINT_mul(group, point, NULL, generator, order, ctx));
/* Cofactor is 1 or 4 */
const BIGNUM *c;
T(c = EC_GROUP_get0_cofactor(group));
- if (BN_is_odd(order))
- T(BN_is_word(c, 1));
- else
- T(BN_is_word(c, 4));
+ T(BN_is_word(c, 1) || BN_is_word(c, 4));
TEST_ASSERT(0);
return test;