Additional CMS content types from RFC 4073, RFC 5083, and RFC 5084.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1355)

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index ba8891dfd72c7eff79c92e580946182710c663cc..bf4d3d29e52c94aa7760fe03f758de62eec0edb2 100644 (file)
--- 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