From 4e1b5ea866dd332294246c4800efe77431010ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Mon, 6 Oct 2014 15:31:47 +0200 Subject: ASN1: Register PDU-dissectors as NEW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke --- asn1/pkcs12/packet-pkcs12-template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asn1/pkcs12/packet-pkcs12-template.c') diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index bdfe126978..db10a0e1bb 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -77,7 +77,7 @@ static gboolean try_null_password = FALSE; static void dissect_AuthenticatedSafe_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static void dissect_SafeContents_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static void dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +static int dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data); #include "packet-pkcs12-hf.c" @@ -494,7 +494,7 @@ void proto_register_pkcs12(void) { "Whether to try and decrypt the encrypted data within the" " PKCS#12 with a NULL password", &try_null_password); - register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); + new_register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); register_ber_oid_syntax(".p12", NULL, "PKCS#12"); register_ber_oid_syntax(".pfx", NULL, "PKCS#12"); } -- cgit v1.2.3