diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-18 18:54:31 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-18 18:03:43 +0000 |
commit | cc37b50334dc9aeb6f0c61301db40d95d4e11afd (patch) | |
tree | 4e364d8c921c8dfe68654fdadd3216867060a603 | |
parent | c6324a0b1ea6478a5f2c24b41cb26d0b02014536 (diff) |
Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r-- | Makefile.nmake | 1 | ||||
-rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 13 | ||||
-rw-r--r-- | config.h.win32 | 3 | ||||
-rw-r--r-- | config.nmake | 34 | ||||
-rw-r--r-- | epan/Makefile.nmake | 1 | ||||
-rw-r--r-- | epan/dissectors/Makefile.nmake | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-kerberos.c | 25 |
7 files changed, 8 insertions, 73 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b5346e22a1..18d30ca185 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -445,7 +445,6 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \ -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \ -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \ - -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \ -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \ -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \ -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \ diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index fcab02a975..8c62b47d79 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -58,19 +58,6 @@ #include <string.h> #include <glib.h> -#ifdef HAVE_LIBNETTLE -#define HAVE_KERBEROS -#ifdef _WIN32 -#include <des.h> -#include <cbc.h> -#else -#include <nettle/des.h> -#include <nettle/cbc.h> -#endif -#include <wsutil/md5.h> -#include <sys/stat.h> /* For keyfile manipulation */ -#endif - #include <wsutil/file_util.h> #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/config.h.win32 b/config.h.win32 index ea3c9474a3..d4c2e9bb69 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -178,9 +178,6 @@ #define ADNS_JGAA_WIN32 1 #endif -/* Define to use the Nettle library */ -@HAVE_NETTLE@ - /* Define to use the gnutls library */ @HAVE_LIBGNUTLS@ diff --git a/config.nmake b/config.nmake index 04e2fd6792..1c35479ed5 100644 --- a/config.nmake +++ b/config.nmake @@ -424,18 +424,6 @@ GCC_DLL=libgcc_s_sjlj-1.dll # KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6 -# -# Optional: the Nettle library enables ??? decryption. -# -# If you have the Nettle encryption library, set this to the -# directory in which the nettle package is stored. -# -# If you don't have Nettle, comment this line out, so that NETTLE_DIR -# isn't defined. -# -# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10 - -# # Optional: the LUA library enables scripting support. # # If you have the LUA library, set this to the directory in which @@ -680,17 +668,6 @@ GCC_DLL=libgcc_s_seh-1.dll #KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1 # -# Optional: the Nettle library enables ??? decryption. -# -# If you have the Nettle encryption library, set this to the -# directory in which the nettle package is stored. -# -# If you don't have Nettle, comment this line out, so that NETTLE_DIR -# isn't defined. -# -# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10 - -# # Optional: the LUA library enables scripting support. # # If you have the LUA library, set this to the directory in which @@ -1594,17 +1571,6 @@ KFW_LIBS= KFW_CONFIG= !ENDIF -!IFDEF NETTLE_DIR -NETTLE_CFLAGS=/I$(NETTLE_DIR) -NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib -# Nmake uses carets to escape special characters -NETTLE_CONFIG=^#define HAVE_LIBNETTLE 1 -!else -NETTLE_CFLAGS= -NETTLE_LIBS= -NETTLE_CONFIG= -!ENDIF - !IFDEF GNUTLS_PKG GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws GNUTLS_PATH=$(GNUTLS_DIR) diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 0731af6cc7..9a5fac0e67 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -58,7 +58,6 @@ libwireshark_LIBS = \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ $(KFW_LIBS) \ - $(NETTLE_LIBS) \ $(ZLIB_LIBS) \ $(GNUTLS_LIBS) \ $(LUA_LIBS) \ diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index c56f61339d..0af94105ca 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -11,8 +11,8 @@ include Makefile.common CFLAGS= $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ /I. /I.. /I../.. $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) -DWS_BUILD_DLL\ - $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \ - $(KFW_CFLAGS) $(AIRPCAP_CFLAGS) $(GEOIP_CFLAGS) \ + $(GNUTLS_CFLAGS) $(KFW_CFLAGS) \ + $(AIRPCAP_CFLAGS) $(GEOIP_CFLAGS) \ /I$(PCAP_DIR)\include .c.obj:: diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 0a6cc36088..b31325e514 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -66,19 +66,6 @@ #include <string.h> #include <glib.h> -#ifdef HAVE_LIBNETTLE -#define HAVE_KERBEROS -#ifdef _WIN32 -#include <des.h> -#include <cbc.h> -#else -#include <nettle/des.h> -#include <nettle/cbc.h> -#endif -#include <wsutil/md5.h> -#include <sys/stat.h> /* For keyfile manipulation */ -#endif - #include <wsutil/file_util.h> #include <epan/packet.h> #include <epan/exceptions.h> @@ -328,7 +315,7 @@ static int hf_kerberos_KDCOptions_renew = -1; static int hf_kerberos_KDCOptions_validate = -1; /*--- End of included file: packet-kerberos-hf.c ---*/ -#line 155 "../../asn1/kerberos/packet-kerberos-template.c" +#line 142 "../../asn1/kerberos/packet-kerberos-template.c" /* Initialize the subtree pointers */ static gint ett_kerberos = -1; @@ -392,7 +379,7 @@ static gint ett_kerberos_KERB_PA_PAC_REQUEST = -1; static gint ett_kerberos_ChangePasswdData = -1; /*--- End of included file: packet-kerberos-ett.c ---*/ -#line 161 "../../asn1/kerberos/packet-kerberos-template.c" +#line 148 "../../asn1/kerberos/packet-kerberos-template.c" static expert_field ei_kerberos_decrypted_keytype = EI_INIT; @@ -419,7 +406,7 @@ static gboolean gbl_do_col_info; #define KERBEROS_ADDR_TYPE_IPV6 24 /*--- End of included file: packet-kerberos-val.h ---*/ -#line 172 "../../asn1/kerberos/packet-kerberos-template.c" +#line 159 "../../asn1/kerberos/packet-kerberos-template.c" static void call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb) @@ -3918,7 +3905,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1661 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1648 "../../asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -4874,7 +4861,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 1960 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1947 "../../asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -4939,7 +4926,7 @@ void proto_register_kerberos(void) { &ett_kerberos_ChangePasswdData, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 1967 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1954 "../../asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { |