diff options
author | Evan Huus <eapache@gmail.com> | 2013-06-19 23:53:25 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-06-19 23:53:25 +0000 |
commit | 0d3718b46799d8d28b9b48d4633da87c91530e5c (patch) | |
tree | 9591dac21f6accf0eaede43776bb01d8b966dd0c /epan/dissectors/packet-pkcs12.c | |
parent | c0fda177b6c4f7e4d0e77acf7c3ee5c7988adab9 (diff) |
Add some missing wmem includes that apparently only show up on Windows.
svn path=/trunk/; revision=50071
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
-rw-r--r-- | epan/dissectors/packet-pkcs12.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index ec17ce5ce6..f6a486eafd 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -38,6 +38,7 @@ #include <epan/oids.h> #include <epan/asn1.h> #include <epan/prefs.h> +#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-pkcs12.h" @@ -143,7 +144,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 81 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -171,7 +172,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 83 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 84 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1127,7 +1128,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 384 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 385 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1415,7 +1416,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 451 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 452 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1446,7 +1447,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 457 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 458 "../../asn1/pkcs12/packet-pkcs12-template.c" }; module_t *pkcs12_module; @@ -1507,7 +1508,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 489 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 490 "../../asn1/pkcs12/packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); |