diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-23 00:32:58 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-12-23 05:39:00 +0000 |
| commit | dd859eada4bd1dd563c2b40ea5aa43adac5d01a8 (patch) | |
| tree | 8e439521218764d94ba45d4d153d29bb663ce096 /epan/dissectors/packet-cms.c | |
| parent | 17582d345da954b5b4c8ed2b561dc279cf364562 (diff) | |
asn1 generated dissectors: cleanup #include usage
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-cms.c')
| -rw-r--r-- | epan/dissectors/packet-cms.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 533fb26b19..c08056ee21 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -32,16 +32,11 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/sha1.h> -#include <wsutil/md5.h> - #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> - -#include <string.h> +#include <wsutil/sha1.h> +#include <wsutil/md5.h> #include "packet-ber.h" #include "packet-cms.h" @@ -189,7 +184,7 @@ static int hf_cms_issuerUniqueID = -1; /* UniqueIdentifier */ static int hf_cms_extensions = -1; /* Extensions */ /*--- End of included file: packet-cms-hf.c ---*/ -#line 57 "../../asn1/cms/packet-cms-template.c" +#line 52 "../../asn1/cms/packet-cms-template.c" /* Initialize the subtree pointers */ @@ -251,7 +246,7 @@ static gint ett_cms_T_subject = -1; static gint ett_cms_SEQUENCE_OF_Attribute = -1; /*--- End of included file: packet-cms-ett.c ---*/ -#line 60 "../../asn1/cms/packet-cms-template.c" +#line 55 "../../asn1/cms/packet-cms-template.c" static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */ @@ -1855,7 +1850,7 @@ static int dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U /*--- End of included file: packet-cms-fn.c ---*/ -#line 138 "../../asn1/cms/packet-cms-template.c" +#line 133 "../../asn1/cms/packet-cms-template.c" /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -2363,7 +2358,7 @@ void proto_register_cms(void) { NULL, HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ -#line 149 "../../asn1/cms/packet-cms-template.c" +#line 144 "../../asn1/cms/packet-cms-template.c" }; /* List of subtrees */ @@ -2427,7 +2422,7 @@ void proto_register_cms(void) { &ett_cms_SEQUENCE_OF_Attribute, /*--- End of included file: packet-cms-ettarr.c ---*/ -#line 154 "../../asn1/cms/packet-cms-template.c" +#line 149 "../../asn1/cms/packet-cms-template.c" }; /* Register protocol */ @@ -2474,7 +2469,7 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 177 "../../asn1/cms/packet-cms-template.c" +#line 172 "../../asn1/cms/packet-cms-template.c" oid_add_from_string("id-data","1.2.840.113549.1.7.1"); oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7"); |