Update and add last (?) set of GOST OIDs.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 46a405b3e64b134ff845d119b3995feef27cba1f..2b756cbb322bb6c4b75507c2538742c856b22f0e 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -434,9 +434,9 @@ id-pe 3                     : qcStatements
 id-pe 4                        : ac-auditEntity
 id-pe 5                        : ac-targeting
 id-pe 6                        : aaControls
 id-pe 4                        : ac-auditEntity
 id-pe 5                        : ac-targeting
 id-pe 6                        : aaControls

-id-pe 7                        : sbqp-ipAddrBlock
-id-pe 8                        : sbqp-autonomousSysNum
-id-pe 9                        : sbqp-routerIdentifier
+id-pe 7                        : sbgp-ipAddrBlock
+id-pe 8                        : sbgp-autonomousSysNum
+id-pe 9                        : sbgp-routerIdentifier

 id-pe 10               : ac-proxying
 !Cname sinfo-access
 id-pe 11               : subjectInfoAccess     : Subject Information Access
 id-pe 10               : ac-proxying
 !Cname sinfo-access
 id-pe 11               : subjectInfoAccess     : Subject Information Access


@@ -677,6 +677,8 @@ id-ce 21            : CRLReason             : X509v3 CRL Reason Code
 id-ce 24               : invalidityDate        : Invalidity Date
 !Cname delta-crl
 id-ce 27               : deltaCRL              : X509v3 Delta CRL Indicator
 id-ce 24               : invalidityDate        : Invalidity Date
 !Cname delta-crl
 id-ce 27               : deltaCRL              : X509v3 Delta CRL Indicator

+!Cname issuing-distribution-point
+id-ce 28       : issuingDistributionPoint : X509v3 Issuing Distrubution Point

 !Cname name-constraints
 id-ce 30               : nameConstraints       : X509v3 Name Constraints
 !Cname crl-distribution-points
 !Cname name-constraints
 id-ce 30               : nameConstraints       : X509v3 Name Constraints
 !Cname crl-distribution-points


@@ -1047,3 +1049,79 @@ rsadsi 1 1 6             : rsaOAEPEncryptionSET
 
                        : Oakley-EC2N-3         : ipsec3
                        : Oakley-EC2N-4         : ipsec4
 
                        : Oakley-EC2N-3         : ipsec3
                        : Oakley-EC2N-4         : ipsec4

+
+iso 0 10118 3 0 55     : whirlpool
+
+# GOST OIDs
+
+member-body 643 2 2    : cryptopro
+member-body 643 2 9    : cryptocom
+
+cryptopro 3            : id-GostR3411-94-with-GostR3410-2001 : GOST R 34.11-94 with GOST R 34.10-2001
+cryptopro 4            : id-GostR3411-94-with-GostR3410-94 : GOST R 34.11-94 with GOST R 34.10-94
+!Cname id-GostR3411-94
+cryptopro 9            : md_gost94             : GOST R 34.11-94
+cryptopro 10           : id-HMACGostR3411-94   : HMAC GOST 34.11-94
+!Cname id-GostR3410-2001
+cryptopro 19           : gost2001      : GOST R 34.10-2001
+!Cname id-GostR3410-94
+cryptopro 20           : gost94        : GOST R 34.10-94
+cryptopro 21           : id-Gost28147-89 : GOST 28147-89
+cryptopro 22           : id-Gost28147-89-MAC   : GOST 28147-89 MAC
+!Cname id-GostR3411-94-prf
+cryptopro 23           : prf-gostr3411-94      : GOST R 34.11-94 PRF
+cryptopro 98           : id-GostR3410-2001DH   : GOST R 34.10-2001 DH
+cryptopro 99           : id-GostR3410-94DH     : GOST R 34.10-94 DH
+
+cryptopro 14 1         : id-Gost28147-89-CryptoPro-KeyMeshing
+cryptopro 14 0         : id-Gost28147-89-None-KeyMeshing
+
+# GOST parameter set OIDs
+
+cryptopro 30 0         : id-GostR3411-94-TestParamSet
+cryptopro 30 1         : id-GostR3411-94-CryptoProParamSet
+
+cryptopro 31 0         : id-Gost28147-89-TestParamSet
+cryptopro 31 1         : id-Gost28147-89-CryptoPro-A-ParamSet
+cryptopro 31 2         : id-Gost28147-89-CryptoPro-B-ParamSet
+cryptopro 31 3         : id-Gost28147-89-CryptoPro-C-ParamSet
+cryptopro 31 4         : id-Gost28147-89-CryptoPro-D-ParamSet
+cryptopro 31 5         : id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet
+cryptopro 31 6         : id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet
+cryptopro 31 7         : id-Gost28147-89-CryptoPro-RIC-1-ParamSet
+
+cryptopro 32 0         : id-GostR3410-94-TestParamSet
+cryptopro 32 2         : id-GostR3410-94-CryptoPro-A-ParamSet
+cryptopro 32 3         : id-GostR3410-94-CryptoPro-B-ParamSet
+cryptopro 32 4         : id-GostR3410-94-CryptoPro-C-ParamSet
+cryptopro 32 5         : id-GostR3410-94-CryptoPro-D-ParamSet
+
+cryptopro 33 1         : id-GostR3410-94-CryptoPro-XchA-ParamSet
+cryptopro 33 2         : id-GostR3410-94-CryptoPro-XchB-ParamSet
+cryptopro 33 3         : id-GostR3410-94-CryptoPro-XchC-ParamSet
+
+cryptopro 35 0         : id-GostR3410-2001-TestParamSet
+cryptopro 35 1         : id-GostR3410-2001-CryptoPro-A-ParamSet
+cryptopro 35 2         : id-GostR3410-2001-CryptoPro-B-ParamSet
+cryptopro 35 3         : id-GostR3410-2001-CryptoPro-C-ParamSet
+
+cryptopro 36 0         : id-GostR3410-2001-CryptoPro-XchA-ParamSet
+cryptopro 36 1         : id-GostR3410-2001-CryptoPro-XchB-ParamSet
+
+id-GostR3410-94 1      : id-GostR3410-94-a
+id-GostR3410-94 2      : id-GostR3410-94-aBis
+id-GostR3410-94 3      : id-GostR3410-94-b
+id-GostR3410-94 4      : id-GostR3410-94-bBis
+
+# Cryptocom LTD GOST OIDs
+
+cryptocom 1 6 1                : id-Gost28147-89-cc    : GOST 28147-89 Cryptocom ParamSet
+!Cname id-Gost3410-94-cc
+cryptocom 1 5 3                : gost94cc      : GOST 34.10-94 Cryptocom
+!Cname id-Gost3410-2001-cc
+cryptocom 1 5 4                : gost2001cc    : GOST 34.10-2001 Cryptocom
+
+cryptocom 1 3 3                : id-GostR3410-11-94-with-GostR3411-94-cc : GOST R 34.10 with GOST R 34.11-94 Cryptocom
+cryptocom 1 3 4                : id-GostR3410-2001-with-GostR3411-94-cc : GOST R 34.10-2001 with GOST R 34.10-94 Cryptocom
+
+cryptocom 1 8 1                : id-GostR3410-2001-ParamSet-cc : GOST R 3410-2001 Parameter Set Cryptocom