diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-08 21:06:20 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-09 03:12:23 +0000 |
| commit | a391a70b3b05c3a3c95bcb9020b37adb6c0af010 (patch) | |
| tree | 5ecb0fd83c3dc0216c96bb429188296302edcdb7 /asn1/pkcs12 | |
| parent | 1a1893ad54a402bda3b77262ecaf68cfe9831368 (diff) | |
"new" dissector API -> dissector API for ASN.1 dissectors.
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220
Reviewed-on: https://code.wireshark.org/review/12480
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 7190ff84b9..419271ac5d 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -59,7 +59,7 @@ PrivateKeyInfo /* we change the CMS id-data dissector to dissect as AuthenticatedSafe not sure why PKCS#12 couldn't have used its own content type OID for AuthenticatedSafe */ - dissector_handle=new_create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12); + dissector_handle=create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12); dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle); %(DEFAULT_BODY)s @@ -71,7 +71,7 @@ PrivateKeyInfo dissector_handle_t dissector_handle; /* we change the CMS id-data dissector to dissect as SafeContents */ - dissector_handle=new_create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12); + dissector_handle=create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12); dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle); %(DEFAULT_BODY)s @@ -145,7 +145,7 @@ PrivateKeyInfo - dissector_handle=new_create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); + dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); dissector_change_string("ber.oid", object_identifier_id, dissector_handle); PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); |