Add some GOST OIDs.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 18a2334d9c7a5cc5db91bcfd99e9c7121c782117..e4cc5a3e9d964ea8695344695bb84dc5c242f502 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -151,6 +151,11 @@ pkcs1 2                    : RSA-MD2               : md2WithRSAEncryption
 pkcs1 3                        : RSA-MD4               : md4WithRSAEncryption
 pkcs1 4                        : RSA-MD5               : md5WithRSAEncryption
 pkcs1 5                        : RSA-SHA1              : sha1WithRSAEncryption
+# According to PKCS #1 version 2.1
+pkcs1 11               : RSA-SHA256            : sha256WithRSAEncryption
+pkcs1 12               : RSA-SHA384            : sha384WithRSAEncryption
+pkcs1 13               : RSA-SHA512            : sha512WithRSAEncryption
+pkcs1 14               : RSA-SHA224            : sha224WithRSAEncryption
 
 pkcs 3                 : pkcs3
 pkcs3 1                        :                       : dhKeyAgreement
@@ -400,6 +405,7 @@ id-pkix 9           : id-pda
 id-pkix 10             : id-aca
 id-pkix 11             : id-qcs
 id-pkix 12             : id-cct
+id-pkix 21             : id-ppl
 id-pkix 48             : id-ad
 
 # PKIX Modules
@@ -428,12 +434,13 @@ id-pe 3                   : qcStatements
 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 14               : proxyCertInfo         : Proxy Certificate Information
 
 # PKIX policyQualifiers for Internet policy qualifiers
 id-qt 1                        : id-qt-cps             : Policy Qualifier CPS
@@ -549,6 +556,11 @@ id-cct 1           : id-cct-crs
 id-cct 2               : id-cct-PKIData
 id-cct 3               : id-cct-PKIResponse
 
+# Predefined Proxy Certificate policy languages
+id-ppl 0               : id-ppl-anyLanguage    : Any language
+id-ppl 1               : id-ppl-inheritAll     : Inherit all
+id-ppl 2               : id-ppl-independent    : Independent
+
 # access descriptors for authority info access extension
 !Cname ad-OCSP
 id-ad 1                        : OCSP                  : OCSP
@@ -624,10 +636,12 @@ X509 5                    :                       : serialNumber
 X509 6                 : C                     : countryName
 X509 7                 : L                     : localityName
 X509 8                 : ST                    : stateOrProvinceName
+X509 9                 :                       : streetAddress
 X509 10                        : O                     : organizationName
 X509 11                        : OU                    : organizationalUnitName
 X509 12                        :                       : title
 X509 13                        :                       : description
+X509 17                        :                       : postalCode
 X509 41                        : name                  : name
 X509 42                        : GN                    : givenName
 X509 43                        :                       : initials
@@ -663,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
+!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
@@ -790,6 +806,13 @@ aes 44                     : AES-256-CFB           : aes-256-cfb
                        : DES-EDE3-CFB1         : des-ede3-cfb1
                        : DES-EDE3-CFB8         : des-ede3-cfb8
 
+# OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84.
+!Alias nist_hashalgs nistAlgorithms 2
+nist_hashalgs 1                : SHA256                : sha256
+nist_hashalgs 2                : SHA384                : sha384
+nist_hashalgs 3                : SHA512                : sha512
+nist_hashalgs 4                : SHA224                : sha224
+
 # Hold instruction CRL entry extension
 !Cname hold-instruction-code
 id-ce 23               : holdInstructionCode   : Hold Instruction Code
@@ -1026,3 +1049,13 @@ rsadsi 1 1 6             : rsaOAEPEncryptionSET
 
                        : Oakley-EC2N-3         : ipsec3
                        : Oakley-EC2N-4         : ipsec4
+
+iso 0 10118 3 0 55     : whirlpool
+
+# GOST OIDs
+
+member-body 643 2 2    : cryptopro
+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
+cryptopro 19           : id-GostR3411-2001     : GOST R 34.10-2001
+cryptopro 20           : id-GostR3411-94       : GOST R 34.10-94