Revert the size_t modifications from HEAD that had led to more

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index fe5d669c7697e0088e4b862dbbfc1015abc49df8..a6a811b8e7c8dae3cf98f31226bb044aab0e1dc4 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -251,6 +251,8 @@ id-smime-ct 5               : id-smime-ct-TDTInfo
 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
@@ -317,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
@@ -554,6 +557,7 @@ id-cmc 24           : id-cmc-confirmCertAcceptance
 
 # other names
 id-on 1                        : id-on-personalData
+id-on 3                        : id-on-permanentIdentifier : Permanent Identifier
 
 # personal data attributes
 id-pda 1               : id-pda-dateOfBirth
@@ -593,6 +597,7 @@ id-ad 2                     : caIssuers             : CA Issuers
 id-ad 3                        : ad_timestamping       : AD Time Stamping
 !Cname ad-dvcs
 id-ad 4                        : AD_DVCS               : ad dvcs
+id-ad 5                        : caRepository          : CA Repository
 
 
 !Alias id-pkix-OCSP ad-OCSP
@@ -722,6 +727,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 freshest-crl
+id-ce 46               : freshestCRL           : X509v3 Freshest CRL
 !Cname inhibit-any-policy
 id-ce 54               : inhibitAnyPolicy      : X509v3 Inhibit Any Policy
 !Cname target-information
@@ -791,7 +798,7 @@ mime-mhs-headings 2 : id-hex-multipart-message : id-hex-multipart-message
 !Cname rle-compression
 1 1 1 1 666 1          : RLE                   : run length compression
 !Cname zlib-compression
-1 1 1 1 666 2          : ZLIB                  : zlib compression
+id-smime-alg 8         : ZLIB                  : zlib compression
 
 # AES aka Rijndael
 
@@ -833,6 +840,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
@@ -1101,7 +1112,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