diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-06 15:31:47 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 11:24:07 +0000 |
| commit | 4e1b5ea866dd332294246c4800efe77431010ad8 (patch) | |
| tree | 8cda568a450b29fd7bbfcbbf03d840ab9f123190 /asn1/pkcs12/packet-pkcs12-template.c | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'asn1/pkcs12/packet-pkcs12-template.c')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"); } |