diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-31 00:57:03 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-31 00:57:03 +0000 |
| commit | c0fcebb07a7246ba9c0dc565f3a8c32078d9bf0b (patch) | |
| tree | 875db1141d2ded7f0724ff7b8476d72e0d01454c /epan/dissectors/packet-pkcs12.c | |
| parent | 0de68078c0f15a16d4fd3f5ce4b4365d66945af4 (diff) | |
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new.
The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL.
svn path=/trunk/; revision=52994
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index b51be6eecc..7b61be9cdf 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -463,7 +463,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted g_string_free(name, TRUE); /* now try and decode it */ - call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0, actx->pinfo, tree); + call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0, actx->pinfo, tree, NULL); return TRUE; #else @@ -616,7 +616,7 @@ static int dissect_pkcs12_T_bagValue(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 110 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); @@ -641,7 +641,7 @@ static int dissect_pkcs12_T_attrValues_item(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 114 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); @@ -852,7 +852,7 @@ static int dissect_pkcs12_T_certValue(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 118 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); @@ -892,7 +892,7 @@ static int dissect_pkcs12_T_crlValue(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 122 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); @@ -932,7 +932,7 @@ static int dissect_pkcs12_T_secretValue(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 126 "../../asn1/pkcs12/pkcs12.cnf" if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); |