From 0a514524c7d003329a47d339f623312db390b344 Mon Sep 17 00:00:00 2001 From: Vitaly Chikunov Date: Wed, 23 Jan 2019 06:01:00 +0300 Subject: [PATCH] test_curves: test all allowed GOST 34.10 curves Enable test for 2001 curves since they are allowed and add TC26 aliases for 256-bit curves. --- test_curves.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/test_curves.c b/test_curves.c index 1ee15b0..7c57c34 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, }; -- 2.39.5