diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-10-03 05:16:57 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-10-03 05:16:57 +0000 |
| commit | 289f2e57d1d554882661bf225c90ad642b034b79 (patch) | |
| tree | 61834fe17449ecf2f61f11979be79675ea8e7549 /asn1/cms | |
| parent | 045ce601a7d3432cdde5cb5c9192391c1e6f78e5 (diff) | |
From Graeme Lunt
X420 - incorrect ExtendedBodyPart handling
ACSE - support for implicitly tagged EXTERNALs and dissection based upon direct-reference RTSE - same change for RTSE EXTERNAL handling as above CMS - support for ContentType, MessageDigest, SigningTime and CounterSignature attributes ESS - support for ESSSecurityLabel and EquivalentLabels attributes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16071 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/cms')
| -rw-r--r-- | asn1/cms/CryptographicMessageSyntax.asn | 20 | ||||
| -rw-r--r-- | asn1/cms/cms.cnf | 14 |
2 files changed, 24 insertions, 10 deletions
diff --git a/asn1/cms/CryptographicMessageSyntax.asn b/asn1/cms/CryptographicMessageSyntax.asn index 5ad4f981a4..02fbf9759e 100644 --- a/asn1/cms/CryptographicMessageSyntax.asn +++ b/asn1/cms/CryptographicMessageSyntax.asn @@ -70,11 +70,11 @@ SignedAttributes ::= SET SIZE (1..MAX) OF Attribute UnsignedAttributes ::= SET SIZE (1..MAX) OF Attribute Attribute ::= SEQUENCE { - attrType OBJECT IDENTIFIER --- attrValues SET OF AttributeValue + attrType OBJECT IDENTIFIER, + attrValues SET OF AttributeValue } --- AttributeValue ::= ANY +AttributeValue ::= ANY SignatureValue ::= OCTET STRING @@ -228,13 +228,13 @@ OtherKeyAttribute ::= SEQUENCE { -- CMS Attributes -- --- MessageDigest ::= OCTET STRING --- --- SigningTime ::= Time --- --- Time ::= CHOICE { --- utcTime UTCTime, --- generalTime GeneralizedTime } +MessageDigest ::= OCTET STRING + +SigningTime ::= Time + +Time ::= CHOICE { + utcTime UTCTime, + generalTime GeneralizedTime } Countersignature ::= SignerInfo diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 22a3461ef1..b2c8252850 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -34,6 +34,11 @@ DigestedData B "1.2.840.113549.1.7.5" "id-digestedData" EncryptedData B "1.2.840.113549.1.7.6" "id-encryptedData" AuthenticatedData B "1.2.840.113549.1.9.16.1.2" "id-ct-authenticatedData" +ContentType B "1.2.840.113549.1.9.3" "id-contentType" +MessageDigest B "1.2.840.113549.1.9.4" "id-messageDigest" +SigningTime B "1.2.840.113549.1.9.5" "id-signingTime" +Countersignature B "1.2.840.113549.1.9.6" "id-counterSignature" + #.NO_EMIT #.TYPE_RENAME @@ -74,6 +79,15 @@ RecipientEncryptedKey/rid rekRid #.FN_BODY OtherKeyAttribute/keyAttr offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); +#.FN_BODY Attribute/attrType + + offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + hf_cms_attrType, object_identifier_id); + +#.FN_BODY AttributeValue + + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + #.END |