GOST cipher names adjustment

[openssl.git] / crypto / objects / obj_mac.num

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 541bb4eb3f631589af5706260b4542acea75dffc..aaf77099b3bd96bc8fe449725dee5383b2d43906 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1009,12 +1009,12 @@ issuerSignTool          1008
 gost89_cbc             1009
 gost89_ecb             1010
 gost89_ctr             1011
-grasshopper_ecb                1012
-grasshopper_ctr                1013
-grasshopper_ofb                1014
-grasshopper_cbc                1015
-grasshopper_cfb                1016
-grasshopper_mac                1017
+kuznyechik_ecb         1012
+kuznyechik_ctr         1013
+kuznyechik_ofb         1014
+kuznyechik_cbc         1015
+kuznyechik_cfb         1016
+kuznyechik_mac         1017
 chacha20_poly1305              1018
 chacha20               1019
 tlsfeature             1020
@@ -1171,16 +1171,16 @@ ieee            1170
 ieee_siswg             1171
 sm2            1172
 id_tc26_cipher_gostr3412_2015_magma            1173
-id_tc26_cipher_gostr3412_2015_magma_ctracpkm           1174
-id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac              1175
+magma_ctr_acpkm                1174
+magma_ctr_acpkm_omac           1175
 id_tc26_cipher_gostr3412_2015_kuznyechik               1176
-id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm              1177
-id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac         1178
+kuznyechik_ctr_acpkm           1177
+kuznyechik_ctr_acpkm_omac              1178
 id_tc26_wrap           1179
 id_tc26_wrap_gostr3412_2015_magma              1180
-id_tc26_wrap_gostr3412_2015_magma_kexp15               1181
+magma_kexp15           1181
 id_tc26_wrap_gostr3412_2015_kuznyechik         1182
-id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15          1183
+kuznyechik_kexp15              1183
 id_tc26_gost_3410_2012_256_paramSetB           1184
 id_tc26_gost_3410_2012_256_paramSetC           1185
 id_tc26_gost_3410_2012_256_paramSetD           1186
@@ -1209,3 +1209,9 @@ id_on_SmtpUTF8Mailbox             1208
 XmppAddr               1209
 SRVName                1210
 NAIRealm               1211
+modp_1536              1212
+modp_2048              1213
+modp_3072              1214
+modp_4096              1215
+modp_6144              1216
+modp_8192              1217