Zero is a valid value for any_skip and map_skip

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index dc10278f4143cad6101d4f34a4b87df28350aae7..e009702e553a744864614e184814a480cfaeaccb 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -252,6 +252,7 @@ id-smime-ct 6               : id-smime-ct-contentInfo
 id-smime-ct 7          : id-smime-ct-DVCSRequestData
 id-smime-ct 8          : id-smime-ct-DVCSResponseData
 id-smime-ct 9          : id-smime-ct-compressedData
+id-smime-ct 27         : id-ct-asciiTextWithCRLF
 
 # S/MIME Attributes
 id-smime-aa 1          : id-smime-aa-receiptRequest
@@ -318,6 +319,7 @@ pkcs9 20            :                       : friendlyName
 pkcs9 21               :                       : localKeyID
 !Cname ms-csp-name
 1 3 6 1 4 1 311 17 1   : CSPName               : Microsoft CSP Name
+1 3 6 1 4 1 311 17 2   : LocalKeySet           : Microsoft Local Key set
 !Alias certTypes pkcs9 22
 certTypes 1            :                       : x509Certificate
 certTypes 2            :                       : sdsiCertificate
@@ -835,6 +837,10 @@ aes 44                     : AES-256-CFB           : aes-256-cfb
                        : DES-EDE3-CFB1         : des-ede3-cfb1
                        : DES-EDE3-CFB8         : des-ede3-cfb8
 
+aes 5                  : id-aes128-wrap 
+aes 25                 : id-aes192-wrap 
+aes 45                 : id-aes256-wrap 
+
 # OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84.
 !Alias nist_hashalgs nistAlgorithms 2
 nist_hashalgs 1                : SHA256                : sha256
@@ -1103,7 +1109,7 @@ cryptopro 20              : gost94        : GOST R 34.10-94
 !Cname id-Gost28147-89
 cryptopro 21           : gost89                : GOST 28147-89
                        : gost89-cnt
-!Cname id-Gost28147-89-MAC                     
+!Cname id-Gost28147-89-MAC
 cryptopro 22           : gost-mac      : GOST 28147-89 MAC
 !Cname id-GostR3411-94-prf
 cryptopro 23           : prf-gostr3411-94      : GOST R 34.11-94 PRF