diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
commit | 2df54da6e2b70777154d38ce3923093568358285 (patch) | |
tree | 4bdb887d40a0a5fee501c0bd30f31388019fbe32 /epan/dissectors/packet-snmp.c | |
parent | 6ae3372687957dfbda6352598aee00e84f83f7da (diff) |
Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.
Protect a bunch of the crypt header files from multiple inclusion.
svn path=/trunk/; revision=51100
Diffstat (limited to 'epan/dissectors/packet-snmp.c')
-rw-r--r-- | epan/dissectors/packet-snmp.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 2101fc8f54..e8ce3b156c 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -61,6 +61,9 @@ #include <glib.h> +#include <wsutil/sha1.h> +#include <wsutil/md5.h> + #include <epan/packet.h> #include <epan/strutil.h> #include <epan/conversation.h> @@ -73,18 +76,13 @@ #include <epan/asn1.h> #include "packet-ipx.h" #include "packet-hpext.h" - +#include <epan/expert.h> +#include <epan/oids.h> #include "packet-ber.h" #include "packet-snmp.h" -#include <epan/crypt/sha1.h> -#include <epan/crypt/md5.h> -#include <epan/expert.h> -#include <epan/oids.h> - - #ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> #endif @@ -311,7 +309,7 @@ static int hf_snmp_priority = -1; /* INTEGER_M1_2147483647 */ static int hf_snmp_operation = -1; /* T_operation */ /*--- End of included file: packet-snmp-hf.c ---*/ -#line 238 "../../asn1/snmp/packet-snmp-template.c" +#line 235 "../../asn1/snmp/packet-snmp-template.c" static int hf_smux_version = -1; static int hf_smux_pdutype = -1; @@ -354,7 +352,7 @@ static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; /*--- End of included file: packet-snmp-ett.c ---*/ -#line 257 "../../asn1/snmp/packet-snmp-template.c" +#line 254 "../../asn1/snmp/packet-snmp-template.c" static expert_field ei_snmp_failed_decrypted_data_pdu = EI_INIT; static expert_field ei_snmp_decrypted_data_bad_formatted = EI_INIT; @@ -2978,7 +2976,7 @@ static void dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1768 "../../asn1/snmp/packet-snmp-template.c" +#line 1765 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3904,7 +3902,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2429 "../../asn1/snmp/packet-snmp-template.c" +#line 2426 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3944,7 +3942,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2445 "../../asn1/snmp/packet-snmp-template.c" +#line 2442 "../../asn1/snmp/packet-snmp-template.c" }; static ei_register_info ei[] = { { &ei_snmp_failed_decrypted_data_pdu, { "snmp.failed_decrypted_data_pdu", PI_MALFORMED, PI_WARN, "Failed to decrypt encryptedPDU", EXPFILL }}, |