osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Pascal Quantin 2014-06-18 18:54:31 +02:00
parent c6324a0b1e
commit cc37b50334
7 changed files with 8 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.nmake
View File

@ -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)/" \

13
asn1/kerberos/packet-kerberos-template.c
View File

@ -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>

3
config.h.win32
View File

@ -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@

34
config.nmake
View File

@ -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
@ -679,17 +667,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.
#
@ -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)

1
epan/Makefile.nmake
View File

@ -58,7 +58,6 @@ libwireshark_LIBS = \
$(C_ARES_LIBS) \
$(ADNS_LIBS) \
$(KFW_LIBS) \
$(NETTLE_LIBS) \
$(ZLIB_LIBS) \
$(GNUTLS_LIBS) \
$(LUA_LIBS) \

4
epan/dissectors/Makefile.nmake
View File

@ -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::

25
epan/dissectors/packet-kerberos.c
View File

@ -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[] = {