From: Wim Lewis Date: Wed, 27 Jul 2016 00:37:29 +0000 (-0700) Subject: Additional CMS content types from RFC 4073, RFC 5083, and RFC 5084. X-Git-Tag: OpenSSL_1_1_0-pre6~26 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=505aee296d377947a8f9aec9e6053282c5ff63fc;p=oweals%2Fopenssl.git Additional CMS content types from RFC 4073, RFC 5083, and RFC 5084. Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1355) --- diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index ba8891dfd7..bf4d3d29e5 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -257,7 +257,10 @@ 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 19 : id-smime-ct-contentCollection +id-smime-ct 23 : id-smime-ct-authEnvelopedData id-smime-ct 27 : id-ct-asciiTextWithCRLF +id-smime-ct 28 : id-ct-xml # S/MIME Attributes id-smime-aa 1 : id-smime-aa-receiptRequest