diff options
| author | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
| commit | 8b0f1addd990ae1b6616dbb5a21e530942461154 (patch) | |
| tree | e72f102e0cec19ee49b5729f8dcfa62afa3a931d /epan/dissectors/packet-pkcs1.c | |
| parent | e6e7c1181bd33a94de00e137685f39520bd858dc (diff) | |
Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.
svn path=/trunk/; revision=50066
Diffstat (limited to 'epan/dissectors/packet-pkcs1.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs1.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index bb594fd768..192f70985a 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -37,6 +37,7 @@ #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> +#include <epan/wmem/wmem.h> #include "packet-ber.h" #include "packet-pkcs1.h" @@ -84,7 +85,7 @@ static int hf_pkcs1_r = -1; /* INTEGER */ static int hf_pkcs1_s = -1; /* INTEGER */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 44 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 45 "../../asn1/pkcs1/packet-pkcs1-template.c" /* Initialize the subtree pointers */ @@ -102,7 +103,7 @@ static gint ett_pkcs1_DSA_Sig_Value = -1; static gint ett_pkcs1_ECDSA_Sig_Value = -1; /*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 47 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 48 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ @@ -372,7 +373,7 @@ static void dissect_ECParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 49 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 50 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -508,7 +509,7 @@ void proto_register_pkcs1(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 56 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 57 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* List of subtrees */ @@ -528,7 +529,7 @@ void proto_register_pkcs1(void) { &ett_pkcs1_ECDSA_Sig_Value, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 61 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 62 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* Register protocol */ @@ -557,7 +558,7 @@ void proto_reg_handoff_pkcs1(void) { /*--- End of included file: packet-pkcs1-dis-tab.c ---*/ -#line 76 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 77 "../../asn1/pkcs1/packet-pkcs1-template.c" register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); |