diff options
author | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-03-30 14:29:10 +0300 |
---|---|---|
committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-04-17 16:21:51 +0300 |
commit | ad16671d49208ea8dcc79613e14fe6148daf959b (patch) | |
tree | 5874dd2db852f1f42642db46fa2049f050f24663 /crypto/objects/obj_mac.num | |
parent | 301ea192c7e0df8a58bf418a147ee8bdb7f1305e (diff) |
GOST cipher names adjustment
The erroneously introduced names grasshopper-* replaced with
kuznyechik-* according to official algorithm name translation.
Too long symbolic names replaced with human-enterable ones.
Also the mechanism of deprecating names in objects.txt is implemented
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11440)
Diffstat (limited to 'crypto/objects/obj_mac.num')
-rw-r--r-- | crypto/objects/obj_mac.num | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 15aa1e9772..aaf77099b3 100644 --- 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 |