diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-12-05 23:00:03 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-12-05 23:00:03 +0000 |
| commit | f27bf1302279c2f360963deaf46bb9d3d8a40513 (patch) | |
| tree | 986dc30eaabd17a0972313bb79b14ecb61d3b8de /asn1/cms | |
| parent | fcd9e87872d1b2b77fb0c21ab08966a96c37832f (diff) | |
| download | wireshark-f27bf1302279c2f360963deaf46bb9d3d8a40513.tar.gz | |
From Grame Lunt:
a patch for the X.411, X420 and CMS dissectors to implement the remaining heading extensions and bodyparts.
This includes GeneralText BP, forwarded content BP (forwarded p22 and forwarded p772), PKCS#7 BP, and "business class" messaging extensions.
The X.411 extensions using the SIGNATURE macro have also been implemented. There is also a fix for a bug in the dissection of integer 22 content type.
Graeme
svn path=/trunk/; revision=16689
Diffstat (limited to 'asn1/cms')
| -rw-r--r-- | asn1/cms/cms-exp.cnf | 2 | ||||
| -rw-r--r-- | asn1/cms/cms.cnf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index 4cb6434014..a721605a36 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -17,7 +17,7 @@ Countersignature BER_CLASS_UNI BER_UNI_TAG_SEQUENCE #.TYPE_ATTR ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -ContentType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ContentType TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DigestAlgorithmIdentifiers TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 SignerInfos TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 95e29b91c1..da70832aee 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -39,6 +39,8 @@ 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" +ContentInfo B "2.6.1.4.18" "id-et-pkcs7" + #.NO_EMIT #.TYPE_RENAME |