Add couple of OIDs. Resync NIDs for consistency with 0.9.7.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index b5209b6fda594f92a45ad7f928e020a3ec21c487..f2ea4a4db0f769cb9a2e7a263e4010324785dfb9 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
@@ -624,10 +629,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
@@ -679,6 +686,8 @@ id-ce 35            : authorityKeyIdentifier : X509v3 Authority Key Identifier
 id-ce 36               : policyConstraints     : X509v3 Policy Constraints
 !Cname ext-key-usage
 id-ce 37               : extendedKeyUsage      : X509v3 Extended Key Usage
+!Cname inhibit-any-policy
+id-ce 54               : inhibitAnyPolicy      : X509v3 Inhibit Any Policy
 !Cname target-information
 id-ce 55               : targetInformation     : X509v3 AC Targeting
 !Cname no-rev-avail
@@ -775,6 +784,26 @@ aes 43                     : AES-256-OFB           : aes-256-ofb
 !Cname aes-256-cfb128
 aes 44                 : AES-256-CFB           : aes-256-cfb
 
+# There are no OIDs for these modes...
+
+                       : AES-128-CFB1          : aes-128-cfb1
+                       : AES-192-CFB1          : aes-192-cfb1
+                       : AES-256-CFB1          : aes-256-cfb1
+                       : AES-128-CFB8          : aes-128-cfb8
+                       : AES-192-CFB8          : aes-192-cfb8
+                       : AES-256-CFB8          : aes-256-cfb8
+                       : DES-CFB1              : des-cfb1
+                       : DES-CFB8              : des-cfb8
+                       : 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
@@ -1008,3 +1037,6 @@ set-brand 6011            : set-brand-Novus
 
 rsadsi 3 10            : DES-CDMF              : des-cdmf
 rsadsi 1 1 6           : rsaOAEPEncryptionSET
+
+                       : Oakley-EC2N-3         : ipsec3
+                       : Oakley-EC2N-4         : ipsec4