Add support for additional GOST curves.

These GOST curves are defined in RFC 7836 and draft-deremin-rfc4491-bis.
Add aliases for 256-bit GOST curves (see
draft-smyshlyaev-tls12-gost-suites) and rename the 512-bit curve ids to
follow names defined in tc26 OID registry.

Diff from Dmitry Baryshkov <dbaryshkov@gmail.com>

Sponsored by ROSA Linux.

ok inoguchi@

2 files changed, 16 insertions, 4 deletions

diff --git a/src/lib/libcrypto/objects/obj_mac.num b/src/lib/libcrypto/objects/obj_mac.num
index 8405ba5e31..3f0b5666fb 100644
--- a/src/lib/libcrypto/objects/obj_mac.num
+++ b/src/lib/libcrypto/objects/obj_mac.num
@@ -940,8 +940,8 @@ gost89_cbc		939
 tc26            940
 id_tc26_gost3411_2012_256               941
 id_tc26_gost3411_2012_512               942
-id_tc26_gost_3410_2012_512_paramSetA            943
-id_tc26_gost_3410_2012_512_paramSetB            944
+id_tc26_gost_3410_12_512_paramSetA              943
+id_tc26_gost_3410_12_512_paramSetB              944
 id_tc26_gost_28147_param_Z              945
 id_tc26_gost3410_2012_256               946
 id_tc26_gost3410_2012_512               947
@@ -990,3 +990,9 @@ dhSinglePass_cofactorDH_sha512kdf_scheme	989
 dh_std_kdf      990
 dh_cofactor_kdf 991
 pSpecified      992
+id_tc26_gost_3410_12_256_paramSetA              993
+id_tc26_gost_3410_12_256_paramSetB              994
+id_tc26_gost_3410_12_256_paramSetC              995
+id_tc26_gost_3410_12_256_paramSetD              996
+id_tc26_gost_3410_12_512_paramSetTest           997
+id_tc26_gost_3410_12_512_paramSetC              998
diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt
index ea7700724f..42f31c3cbe 100644
--- a/src/lib/libcrypto/objects/objects.txt
+++ b/src/lib/libcrypto/objects/objects.txt
@@ -1372,8 +1372,14 @@ member-body 643 7 1	: tc26
 tc26 1 2 2              : streebog256 : GOST R 34.11-2012 (256 bit)
 !Cname id-tc26-gost3411-2012-512
 tc26 1 2 3              : streebog512 : GOST R 34-11-2012 (512 bit)
-tc26 2 1 2 1            : id-tc26-gost-3410-2012-512-paramSetA
-tc26 2 1 2 2            : id-tc26-gost-3410-2012-512-paramSetB
+tc26 2 1 1 1            : id-tc26-gost-3410-12-256-paramSetA : GOST R 34.10-2012 (256 bit) ParamSet A
+tc26 2 1 1 2            : id-tc26-gost-3410-12-256-paramSetB : GOST R 34.10-2012 (256 bit) ParamSet B
+tc26 2 1 1 3            : id-tc26-gost-3410-12-256-paramSetC : GOST R 34.10-2012 (256 bit) ParamSet C
+tc26 2 1 1 4            : id-tc26-gost-3410-12-256-paramSetD : GOST R 34.10-2012 (256 bit) ParamSet D
+tc26 2 1 2 0            : id-tc26-gost-3410-12-512-paramSetTest : GOST R 34.10-2012 (512 bit) testing parameter set
+tc26 2 1 2 1            : id-tc26-gost-3410-12-512-paramSetA : GOST R 34.10-2012 (512 bit) ParamSet A
+tc26 2 1 2 2            : id-tc26-gost-3410-12-512-paramSetB : GOST R 34.10-2012 (512 bit) ParamSet B
+tc26 2 1 2 3            : id-tc26-gost-3410-12-512-paramSetC : GOST R 34.10-2012 (512 bit) ParamSet C
 tc26 2 5 1 1            : id-tc26-gost-28147-param-Z
 tc26 1 1 1              : id-tc26-gost3410-2012-256 : GOST R 34.10-2012 (256 bit)
 tc26 1 1 2              : id-tc26-gost3410-2012-512 : GOST R 34.10-2012 (512 bit)