GOST cipher names adjustment

[openssl.git] / crypto / objects / objects.txt

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index dcdfa903c5fdb6030a5c208a5512a9b618bbbf53..a9ccf7eded2a33140a05658c4f51fe8e9bffb34e 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -431,9 +431,9 @@ rsadsi 3 8          : RC5-CBC               : rc5-cbc
 !Cname ms-efs
 1 3 6 1 4 1 311 10 3 4 : msEFS                 : Microsoft Encrypted File System
 !Cname ms-smartcard-login
-1 3 6 1 4 1 311 20 2 2 : msSmartcardLogin      : Microsoft Smartcardlogin
+1 3 6 1 4 1 311 20 2 2 : msSmartcardLogin      : Microsoft Smartcard Login
 !Cname ms-upn
-1 3 6 1 4 1 311 20 2 3 : msUPN                 : Microsoft Universal Principal Name
+1 3 6 1 4 1 311 20 2 3 : msUPN                 : Microsoft User Principal Name
 
 1 3 6 1 4 1 188 7 1 1 2        : IDEA-CBC              : idea-cbc
                        : IDEA-ECB              : idea-ecb
@@ -609,6 +609,10 @@ id-cmc 24          : id-cmc-confirmCertAcceptance
 # other names
 id-on 1                        : id-on-personalData
 id-on 3                        : id-on-permanentIdentifier : Permanent Identifier
+id-on 5                        : id-on-xmppAddr : XmppAddr
+id-on 7                        : id-on-dnsSRV : SRVName
+id-on 8                        : id-on-NAIRealm : NAIRealm
+id-on 9                        : id-on-SmtpUTF8Mailbox : Smtp UTF8 Mailbox
 
 # personal data attributes
 id-pda 1               : id-pda-dateOfBirth
@@ -1355,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
@@ -1367,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
 
@@ -1397,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
@@ -1616,6 +1620,8 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 
 # NID for SSKDF
                             : SSKDF              : sskdf
+# NID for X942KDF
+                            : X942KDF            : x942kdf
 
 # NID for X963-2001 KDF
                             : X963KDF            : x963kdf
@@ -1664,6 +1670,13 @@ id-pkinit 5                     : pkInitKDC             : Signing KDC Response
                             : ffdhe4096
                             : ffdhe6144
                             : ffdhe8192
+# NIDs for RFC3526 DH parameters
+                            : modp_1536
+                            : modp_2048
+                            : modp_3072
+                            : modp_4096
+                            : modp_6144
+                            : modp_8192
 
 # OIDs for DSTU-4145/DSTU-7564 (http://zakon2.rada.gov.ua/laws/show/z0423-17)