diff options
Diffstat (limited to 'asn1/cms/cms.cnf')
| -rw-r--r-- | asn1/cms/cms.cnf | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 9c71907ec0..6c35546374 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -98,23 +98,12 @@ RevocationInfoChoice/other otherRIC #.FN_BODY EncapsulatedContentInfo/eContent - gint8 class; - gboolean pc, ind; - gint32 tag; - guint32 len; - int pdu_offset = offset; - int content_offset; - - /* XXX Do we care about printing out the octet string? */ - offset = dissect_cms_OCTET_STRING(FALSE, tvb, offset, actx, NULL, hf_cms_eContent); - - pdu_offset = get_ber_identifier(tvb, pdu_offset, &class, &pc, &tag); - content_offset = pdu_offset = get_ber_length(tvb, pdu_offset, &len, &ind); - pdu_offset = call_ber_oid_callback(object_identifier_id, tvb, pdu_offset, actx->pinfo, top_tree ? top_tree : tree); - - /* save the content for checking the message digest */ - content_tvb = tvb_new_subset(tvb, content_offset, len, -1); + offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &content_tvb); + proto_item_set_text(actx->created_item, "eContent (%u bytes)", tvb_length (content_tvb)); + + call_ber_oid_callback(object_identifier_id, content_tvb, 0, actx->pinfo, top_tree ? top_tree : tree); + #.FN_PARS OtherRecipientInfo/oriType FN_VARIANT = _str VAL_PTR = &object_identifier_id |