[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  505aee296d377947a8f9aec9e6053282c5ff63fc (commit)
      from  0930e07d1eb522e663abe543ee865a508749946e (commit)


- Log -----------------------------------------------------------------
commit 505aee296d377947a8f9aec9e6053282c5ff63fc
Author: Wim Lewis <wiml at omnigroup.com>
Date:   Tue Jul 26 17:37:29 2016 -0700

    Additional CMS content types from RFC 4073, RFC 5083, and RFC 5084.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1355)

-----------------------------------------------------------------------

Summary of changes:
 crypto/objects/objects.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index ba8891d..bf4d3d2 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