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/objects.txt | |
| 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/objects.txt')
| -rw-r--r-- | crypto/objects/objects.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 9819c539b7..a9ccf7eded 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1359,11 +1359,11 @@ id-tc26-mac 2 : id-tc26-hmac-gost-3411-2012-512 : HMAC GOST 34.11-2012 512 bit id-tc26-algorithms 5 : id-tc26-cipher id-tc26-cipher 1 : id-tc26-cipher-gostr3412-2015-magma -id-tc26-cipher-gostr3412-2015-magma 1 : id-tc26-cipher-gostr3412-2015-magma-ctracpkm -id-tc26-cipher-gostr3412-2015-magma 2 : id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac +id-tc26-cipher-gostr3412-2015-magma 1 : magma-ctr-acpkm +id-tc26-cipher-gostr3412-2015-magma 2 : magma-ctr-acpkm-omac id-tc26-cipher 2 : id-tc26-cipher-gostr3412-2015-kuznyechik -id-tc26-cipher-gostr3412-2015-kuznyechik 1 : id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm -id-tc26-cipher-gostr3412-2015-kuznyechik 2 : id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac +id-tc26-cipher-gostr3412-2015-kuznyechik 1 : kuznyechik-ctr-acpkm +id-tc26-cipher-gostr3412-2015-kuznyechik 2 : kuznyechik-ctr-acpkm-omac id-tc26-algorithms 6 : id-tc26-agreement id-tc26-agreement 1 : id-tc26-agreement-gost-3410-2012-256 @@ -1371,9 +1371,9 @@ id-tc26-agreement 2 : id-tc26-agreement-gost-3410-2012-512 id-tc26-algorithms 7 : id-tc26-wrap id-tc26-wrap 1 : id-tc26-wrap-gostr3412-2015-magma -id-tc26-wrap-gostr3412-2015-magma 1 : id-tc26-wrap-gostr3412-2015-magma-kexp15 +id-tc26-wrap-gostr3412-2015-magma 1 : magma-kexp15 id-tc26-wrap 2 : id-tc26-wrap-gostr3412-2015-kuznyechik -id-tc26-wrap-gostr3412-2015-kuznyechik 1 : id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15 +id-tc26-wrap-gostr3412-2015-kuznyechik 1 : kuznyechik-kexp15 id-tc26 2 : id-tc26-constants @@ -1401,12 +1401,12 @@ member-body 643 100 111 : subjectSignTool : Signing Tool of Subject member-body 643 100 112 : issuerSignTool : Signing Tool of Issuer #GOST R34.13-2015 Grasshopper "Kuznechik" - : grasshopper-ecb - : grasshopper-ctr - : grasshopper-ofb - : grasshopper-cbc - : grasshopper-cfb - : grasshopper-mac + : kuznyechik-ecb + : kuznyechik-ctr + : kuznyechik-ofb + : kuznyechik-cbc + : kuznyechik-cfb + : kuznyechik-mac #GOST R34.13-2015 Magma : magma-ecb |