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 /asn1/pkcs12 | |
| 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 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 2 | ||||
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index d0e2e64e33..85267e2b80 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -371,7 +371,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 diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 3c182b1221..a1c75c9817 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -108,23 +108,23 @@ PrivateKeyInfo #.FN_BODY SafeBag/bagValue 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); #.FN_BODY PKCS12Attribute/attrValues/_item 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); #.FN_BODY CertBag/certValue 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); #.FN_BODY CRLBag/crlValue 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); #.FN_BODY SecretBag/secretValue 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); #.FN_HDR PBEParameter /* initialise the encryption parameters */ |