aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/cmp/cmp.cnf4
-rw-r--r--asn1/crmf/crmf.cnf4
-rw-r--r--asn1/x509af/x509af.cnf10
-rw-r--r--epan/dissectors/packet-cmp.c4
-rw-r--r--epan/dissectors/packet-crmf.c4
-rw-r--r--epan/dissectors/packet-x509af.c10
6 files changed, 18 insertions, 18 deletions
diff --git a/asn1/cmp/cmp.cnf b/asn1/cmp/cmp.cnf
index 5547867297..fa9efd09aa 100644
--- a/asn1/cmp/cmp.cnf
+++ b/asn1/cmp/cmp.cnf
@@ -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
diff --git a/asn1/crmf/crmf.cnf b/asn1/crmf/crmf.cnf
index 9bf6bfc9a5..f4bfef8bf4 100644
--- a/asn1/crmf/crmf.cnf
+++ b/asn1/crmf/crmf.cnf
@@ -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
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 6f9a78a755..f3ea5574e2 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -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
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 96e6b5d5da..99770656ba 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -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);
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 0c88a4a46b..ac107b189e 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -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);
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index ee50706b89..01c08f6c88 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 17:07:52 +0000