aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-06-04 19:17:44 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2014-06-06 15:33:01 +0000
commitad7b5381ac54567217f12ee729c7be6cd2848d0f (patch)
tree657b9b157455eb8d55713ea7d8df20c583b492fd /config.nmake
parent97f0fb0e5386ae4bfd759311d03727598556955c (diff)
Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake18
1 files changed, 13 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake
index 66b4885749..660139d4ab 100644
--- a/config.nmake
+++ b/config.nmake
@@ -433,7 +433,9 @@ C_ARES_PKG=1.9.1-1
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2
+GNUTLS_PKG=3.1.22-2.3
+GPGERROR_DLL=libgpg-error-0.dll
+GCC_DLL=libgcc_s_sjlj-1.dll
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
@@ -686,7 +688,9 @@ C_ARES_PKG=1.9.1-1
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2-1
+GNUTLS_PKG=3.1.22-2.3
+GPGERROR_DLL=libgpg-error6-0.dll
+GCC_DLL=libgcc_s_seh-1.dll
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
@@ -1635,12 +1639,16 @@ GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM
GNUTLS_PATH=$(GNUTLS_DIR)
# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
-GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-11.lib
+GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-20.lib
GNUTLS_LIBS=\
- $(GNUTLS_DIR)\bin\libtasn1-3.lib \
+ $(GNUTLS_DIR)\bin\libtasn1-6.lib \
+!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
$(GNUTLS_DIR)\bin\libgpg-error-0.lib \
+!ELSE
+ $(GNUTLS_DIR)\bin\libgpg-error6-0.lib \
+!ENDIF
$(GCRYPT_LIBS) \
- $(GNUTLS_DIR)\bin\libgnutls-26.lib
+ $(GNUTLS_DIR)\bin\libgnutls-28.lib
# Nmake uses carets to escape special characters
GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1