diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-06-21 15:37:26 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-22 17:01:52 +0000 |
| commit | 475a232a5bd9ac2f87b1b7881dd413a750c05c2a (patch) | |
| tree | 70a25c8693975adaef9c02332f7753b2e86cb4cd /asn1 | |
| parent | 02b497743c63eb530d09b9da829f61291925dce4 (diff) | |
PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]
Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c
Reviewed-on: https://code.wireshark.org/review/9003
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 6 | ||||
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 38067b46f4..9c31a461f0 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -58,6 +58,7 @@ void proto_reg_handoff_pkcs12(void); static int proto_pkcs12 = -1; static int hf_pkcs12_X509Certificate_PDU = -1; +static int hf_pkcs12_AuthenticatedSafe_PDU = -1; /* AuthenticatedSafe */ static gint ett_decrypted_pbe = -1; static expert_field ei_pkcs12_octet_string_expected = EI_INIT; @@ -451,6 +452,11 @@ void proto_register_pkcs12(void) { { "X509Certificate", "pkcs12.X509Certificate", FT_NONE, BASE_NONE, NULL, 0, "pkcs12.X509Certificate", HFILL }}, + { &hf_pkcs12_AuthenticatedSafe_PDU, + { "AuthenticatedSafe", "pkcs12.AuthenticatedSafe", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + #include "packet-pkcs12-hfarr.c" }; diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 19c7d43ce9..69fa46baa4 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -51,7 +51,7 @@ PrivateKeyInfo/version privateKeyVersion PBKDF2Params/salt saltChoice #.PDU_NEW -AuthenticatedSafe +#AuthenticatedSafe PrivateKeyInfo #.FN_BODY PFX |