osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone. 

svn path=/trunk/; revision=50113
This commit is contained in:
Michael Mann 2013-06-22 15:08:18 +00:00
parent 707e2ce409
commit 87eb22f464
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/cmp/cmp.cnf
View File

@ -84,10 +84,10 @@ RevAnnContent/status pkistatus
#.FN_PARS InfoTypeAndValue/infoType
FN_VARIANT = _str HF_INDEX = hf_cmp_type_oid VAL_PTR = (const char**)&actx->private_data
FN_VARIANT = _str HF_INDEX = hf_cmp_type_oid VAL_PTR = &actx->external.direct_reference
#.FN_BODY InfoTypeAndValue/infoValue
offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);
#.FN_PARS PKIBody
VAL_PTR = &branch_taken

4
asn1/crmf/crmf.cnf
View File

@ -68,10 +68,10 @@ PrivateKeyInfo/version privkey_version
EncKeyWithID/privateKey enckeywid_privkey
#.FN_PARS AttributeTypeAndValue/type
FN_VARIANT = _str HF_INDEX = hf_crmf_type_oid VAL_PTR = (const char**)&actx->private_data
FN_VARIANT = _str HF_INDEX = hf_crmf_type_oid VAL_PTR = &actx->external.direct_reference
#.FN_BODY AttributeTypeAndValue/value
offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);
#.END

10
asn1/x509af/x509af.cnf
View File

@ -82,17 +82,17 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree);
#.FN_PARS Extension/extnId
FN_VARIANT = _str HF_INDEX = hf_x509af_extension_id VAL_PTR = (const char**)&actx->private_data
FN_VARIANT = _str HF_INDEX = hf_x509af_extension_id VAL_PTR = &actx->external.direct_reference
#.FN_BODY Extension/extnId
const char *name;
%(DEFAULT_BODY)s
if(actx->private_data) {
name = oid_resolved_from_string((const char*)actx->private_data);
if(actx->external.direct_reference) {
name = oid_resolved_from_string(actx->external.direct_reference);
proto_item_append_text(tree, " (%%s)", name ? name : (const char *)actx->private_data);
proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference);
}
#.FN_BODY Extension/extnValue
@ -103,7 +103,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
/* skip past the T and L */
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);
#.FN_BODY SubjectName

4
epan/dissectors/packet-cmp.c
View File

@ -386,7 +386,7 @@ dissect_cmp_PKIFreeText(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmp_type_oid, (const char**)&actx->private_data);
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cmp_type_oid, &actx->external.direct_reference);
return offset;
}
@ -396,7 +396,7 @@ dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_cmp_T_infoValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 90 "../../asn1/cmp/cmp.cnf"
offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);

4
epan/dissectors/packet-crmf.c
View File

@ -226,7 +226,7 @@ dissect_crmf_CertTemplate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
static int
dissect_crmf_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_crmf_type_oid, (const char**)&actx->private_data);
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_crmf_type_oid, &actx->external.direct_reference);
return offset;
}
@ -236,7 +236,7 @@ dissect_crmf_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
static int
dissect_crmf_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 74 "../../asn1/crmf/crmf.cnf"
offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);

10
epan/dissectors/packet-x509af.c
View File

@ -373,13 +373,13 @@ dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
#line 88 "../../asn1/x509af/x509af.cnf"
const char *name;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, (const char**)&actx->private_data);
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, &actx->external.direct_reference);
if(actx->private_data) {
name = oid_resolved_from_string((const char*)actx->private_data);
if(actx->external.direct_reference) {
name = oid_resolved_from_string(actx->external.direct_reference);
proto_item_append_text(tree, " (%s)", name ? name : (const char *)actx->private_data);
proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference);
}
@ -408,7 +408,7 @@ dissect_x509af_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
/* skip past the T and L */
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);