diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-27 19:51:37 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-28 04:59:08 +0000 |
| commit | 65303efe4da5325a4d4db9c389f2dfb09a55eecc (patch) | |
| tree | bf0ad5116d68142b87c864707ad8b599f503b7af /epan/dissectors/packet-pkcs12.c | |
| parent | 3b235615bf741dbe2fff5938a708cd9ab6865384 (diff) | |
| download | wireshark-65303efe4da5325a4d4db9c389f2dfb09a55eecc.tar.gz | |
Remove some unneeded includes of <sys/time.h>.
Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d
Reviewed-on: https://code.wireshark.org/review/7441
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 1bded351d6..f9422abfaf 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -35,10 +35,6 @@ #include "config.h" -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> @@ -144,7 +140,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 81 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 77 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -172,7 +168,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 84 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1163,7 +1159,7 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 392 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 388 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1451,7 +1447,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 459 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 455 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1482,7 +1478,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 465 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 461 "../../asn1/pkcs12/packet-pkcs12-template.c" }; static ei_register_info ei[] = { { &ei_pkcs12_octet_string_expected, { "pkcs12.octet_string_expected", PI_PROTOCOL, PI_WARN, "BER Error: OCTET STRING expected", EXPFILL }}, @@ -1550,7 +1546,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 504 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 500 "../../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"); |