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 0060f3c64e2f73beb9ec5258238d545fd1d36321..a6a811b8e7c8dae3cf98f31226bb044aab0e1dc4 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
@@ -555,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
@@ -724,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