aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/cms
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/asn1/cms')
-rw-r--r--epan/dissectors/asn1/cms/CryptographicMessageSyntax.asn6
-rw-r--r--epan/dissectors/asn1/cms/cms.cnf1
2 files changed, 7 insertions, 0 deletions
diff --git a/epan/dissectors/asn1/cms/CryptographicMessageSyntax.asn b/epan/dissectors/asn1/cms/CryptographicMessageSyntax.asn
index 9cffdcf3de..3ade46892a 100644
--- a/epan/dissectors/asn1/cms/CryptographicMessageSyntax.asn
+++ b/epan/dissectors/asn1/cms/CryptographicMessageSyntax.asn
@@ -365,6 +365,12 @@ ExtendedCertificateInfo ::= SEQUENCE {
Signature ::= BIT STRING
+-- PKCS #7 type that was removed from CMS
+
+DigestInfo ::= SEQUENCE {
+ digestAlgorithm DigestAlgorithmIdentifier,
+ digest Digest }
+
-- From S/MIME
SMIMECapabilities ::= SEQUENCE OF SMIMECapability
diff --git a/epan/dissectors/asn1/cms/cms.cnf b/epan/dissectors/asn1/cms/cms.cnf
index dad1dfecef..045dca9e9e 100644
--- a/epan/dissectors/asn1/cms/cms.cnf
+++ b/epan/dissectors/asn1/cms/cms.cnf
@@ -20,6 +20,7 @@ Countersignature
Digest
DigestAlgorithmIdentifier
DigestAlgorithmIdentifiers
+DigestInfo
EncapsulatedContentInfo
EnvelopedData
IssuerAndSerialNumber