diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-10-29 12:11:42 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-10-29 12:11:42 +0000 |
| commit | b2160d6d259568a69e411d1e7af689b30a3ea7a7 (patch) | |
| tree | 26818d081beb1e352fa062cbeecd1600841aaeb0 /asn1/cms/cms.cnf | |
| parent | 076d4710ecb611008ca83c42b422e8ed1745726c (diff) | |
| download | wireshark-b2160d6d259568a69e411d1e7af689b30a3ea7a7.tar.gz wireshark-b2160d6d259568a69e411d1e7af689b30a3ea7a7.tar.bz2 wireshark-b2160d6d259568a69e411d1e7af689b30a3ea7a7.zip | |
update to cms to use workaround to lack of ANY and reducing the template significantly
svn path=/trunk/; revision=12434
Diffstat (limited to 'asn1/cms/cms.cnf')
| -rw-r--r-- | asn1/cms/cms.cnf | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index ddf3b742dd..100c3656fe 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -9,11 +9,15 @@ InformationFramework x509if #.INCLUDE ../x509af/x509af_exp.cnf #.INCLUDE ../x509if/x509if_exp.cnf +#.INCLUDE ./cms_dummy.cnf #.EXPORTS +ContentInfo +EncapsulatedContentInfo SignedData Countersignature IssuerAndSerialNumber +OtherKeyAttribute #.REGISTER SignedData B "1.2.840.113549.1.7.2" "id-signedData" @@ -23,8 +27,6 @@ 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" #.NO_EMIT -OtherKeyAttribute -EncapsulatedContentInfo #.TYPE_RENAME @@ -32,6 +34,37 @@ EncapsulatedContentInfo SignerInfo/signature signatureValue RecipientEncryptedKey/rid rekRid +#.FN_BODY ContentInfo/contentType + offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + hf_cms_ci_contentType, object_identifier_id); + +#.FN_BODY ContentInfo/content + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + +#.FN_BODY EncapsulatedContentInfo/eContentType + offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + hf_cms_ci_contentType, object_identifier_id); + +#.FN_BODY EncapsulatedContentInfo/eContent + guint8 class; + gboolean pc, ind; + guint32 tag, len; + int pdu_offset = offset; + + /* XXX Do we care about printing out the octet string? */ + offset = dissect_cms_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_eContent); + + pdu_offset = get_ber_identifier(tvb, pdu_offset, &class, &pc, &tag); + pdu_offset = get_ber_length(tvb, pdu_offset, &len, &ind); + pdu_offset = call_ber_oid_callback(object_identifier_id, tvb, pdu_offset, pinfo, tree); + +#.FN_BODY OtherKeyAttribute/keyAttrId + offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + hf_cms_ci_contentType, object_identifier_id); + +#.FN_BODY OtherKeyAttribute/keyAttr + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + #.END |