summaryrefslogtreecommitdiffstats
path: root/crypto/objects
diff options
context:
space:
mode:
authorWim Lewis <wiml@omnigroup.com>2016-07-26 17:37:29 -0700
committerRich Salz <rsalz@openssl.org>2016-08-01 09:33:12 -0400
commit505aee296d377947a8f9aec9e6053282c5ff63fc (patch)
tree26545043e51b2a8a42dbc6f4f6a703ffd90a854f /crypto/objects
parent0930e07d1eb522e663abe543ee865a508749946e (diff)
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)
Diffstat (limited to 'crypto/objects')
-rw-r--r--crypto/objects/objects.txt3
1 files changed, 3 insertions, 0 deletions
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