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>

diff --git a/Makefile.nmake b/Makefile.nmake
index 066577ea674556ec73270ac3ce44297ca69717a1..4f76b0da5d805b4dcd0d3e3a3d5dcb87f38f7fb6 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1071,6 +1071,7 @@ clean_setup:
        rm -r -f gnutls-2.8.5-*-win??ws
        rm -r -f gnutls-2.10.3-*-win??ws
        rm -r -f gnutls-2.12.18-*-win??ws
+       rm -r -f gnutls-3.1.22-*-win??ws
 !IF "$(GTK_NAME)" == "gtk2"
        rm -r -f gtk2
 !ELSE
@@ -1356,10 +1357,16 @@ install-all: install-generated-files
        xcopy $(KFW_PATH)\k5sprt32.dll $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF GNUTLS_DIR
-       xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d
-       xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d
-       xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d
-       xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libffi-6.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\$(GCC_DLL) $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libgcrypt-20.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libgmp-10.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libgnutls-28.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\$(GPGERROR_DLL) $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libhogweed-2-4.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libnettle-4-6.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libp11-kit-0.dll $(INSTALL_DIR) /d
+       xcopy $(GNUTLS_DIR)\bin\libtasn1-6.dll $(INSTALL_DIR) /d
 ! IF "$(INTL_DLL)" != "libintl-8.dll"
 # The gtk+ bundle doesn't provide libintl-8.dll (which is the case
 # with the 32-bit package); use the GNUTLS version.

diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake
index 638ddfedba83d89cc4616380c9f5a211aa36ddce..5615e8830fef587080a5aef2e1525dbd8a103260 100644 (file)
--- a/cmake/modules/FindGCRYPT.cmake
+++ b/cmake/modules/FindGCRYPT.cmake
@@ -22,8 +22,8 @@ FIND_PATH(GCRYPT_INCLUDE_DIR gcrypt.h
          include
 )
 
-SET(GCRYPT_NAMES gcrypt libgcrypt-11)
-FIND_LIBRARY(GCRYPT_LIBRARY NAMES ${GCRYPT_NAMES} HINTS "${GCRYPT_HINTS}/bin")
+SET(GCRYPT_NAMES gcrypt libgcrypt-20)
+FIND_LIBRARY(GCRYPT_LIBRARY NAMES ${GCRYPT_NAMES} libgcc_s_sjlj-1 HINTS "${GCRYPT_HINTS}/bin")
 FIND_LIBRARY(GCRYPT_ERROR_LIBRARY NAMES gpg-error libgpg-error-0 HINTS "${GCRYPT_HINTS}/bin")
 
 # handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if 

diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake
index 8a21922d2137bb940665f3996648bccb2a89db0c..f06835fc445bc7ecbb28eb88a504a25e8964687b 100644 (file)
--- a/cmake/modules/FindGNUTLS.cmake
+++ b/cmake/modules/FindGNUTLS.cmake
@@ -25,8 +25,8 @@ FIND_PATH(GNUTLS_INCLUDE_DIR
          ${GNUTLS_HINTS}
 )
 
-SET(GNUTLS_NAMES gnutls libgnutls-26)
-FIND_LIBRARY(GNUTLS_LIBRARY NAMES ${GNUTLS_NAMES} HINTS "${GNUTLS_HINTS}/bin" )
+SET(GNUTLS_NAMES gnutls libgnutls-28)
+FIND_LIBRARY(GNUTLS_LIBRARY NAMES ${GNUTLS_NAMES} libgmp-10 libgcc_s_sjlj-1 libffi-6 libhogweed-2-4 libnettle-4-6 libp11-kit-0 libtasn1-6 HINTS "${GNUTLS_HINTS}/bin" )
 
 # handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if 
 # all listed variables are TRUE

diff --git a/config.nmake b/config.nmake
index 66b48857492f48e999db925e7c2da770f29d24c7..660139d4abcd798ec397eb96cae617142ada4c38 100644 (file)
--- 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

diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 02848ebee095b49ee49baad7bde10297529458a6..75a446b95121cb878f574b2f2863eb42ec1637d5 100644 (file)
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -1636,7 +1636,7 @@ static guint32 calculate_digest(pdu_security_settings_t *pdu_security_settings,
                 gint message_length;
                 guint8 *message_data;
                 guint8  mac[4];
-                ssize_t read_digest_length = 4;
+                size_t read_digest_length = 4;
 
                 /* Open gcrypt handle */
                 /* N.B. Unfortunately GCRY_MAC_CMAC_AES is not available in currently used version of gcrypt! */

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 1c32f06f06a427f15d939ab9054197d334b8eb7a..975b4885ffd889cb964196f0db8b17a96d22ac97 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -204,6 +204,8 @@ NSIS_FLAGS=\
        /DKFW_PATH=$(KFW_PATH) \
 !ENDIF
 !IF "$(GNUTLS_DIR)" != ""
+       /DGPGERROR_DLL=$(GPGERROR_DLL) \
+       /DGCC_DLL=$(GCC_DLL) \
        /DGNUTLS_DIR=$(GNUTLS_DIR) \
 !ENDIF
 !IF "$(ZLIB_DIR)" != ""

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index cff66c2c0f4f231229601bc5f7088f3c09bb7199..3c96c78b44db26cab7c2daeed62e962ec9cf9a9c 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -312,10 +312,16 @@ File "${STAGING_DIR}\krb5_32.dll"
 File "${STAGING_DIR}\k5sprt32.dll"
 !endif
 !ifdef GNUTLS_DIR
-File "${STAGING_DIR}\libgcrypt-11.dll"
-File "${STAGING_DIR}\libgnutls-26.dll"
-File "${STAGING_DIR}\libgpg-error-0.dll"
-File "${STAGING_DIR}\libtasn1-3.dll"
+File "${STAGING_DIR}\libffi-6.dll"
+File "${STAGING_DIR}\${GCC_DLL}"
+File "${STAGING_DIR}\libgcrypt-20.dll"
+File "${STAGING_DIR}\libgmp-10.dll"
+File "${STAGING_DIR}\libgnutls-28.dll"
+File "${STAGING_DIR}\${GPGERROR_DLL}"
+File "${STAGING_DIR}\libhogweed-2-4.dll"
+File "${STAGING_DIR}\libnettle-4-6.dll"
+File "${STAGING_DIR}\libp11-kit-0.dll"
+File "${STAGING_DIR}\libtasn1-6.dll"
 StrCmp "${INTL_DLL}" "libintl-8.dll" SkipLibIntl8
 File "${STAGING_DIR}\libintl-8.dll"
 SkipLibIntl8:

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index bc9bd4ba4d52f7a84131a9984ea6b6ce4d15c15d..1b316ff509405d170dd3cb61ad332d2f722f0ea5 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -22,7 +22,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2014-05-16"
+export DOWNLOAD_TAG="2014-06-05"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`

diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh
index bd61722dfe7eed4501aab1bd653e3c779533d21b..0918b2bebd1714ca5fc66c5f79fda3cc1cae58fb 100755 (executable)
--- a/tools/win64-setup.sh
+++ b/tools/win64-setup.sh
@@ -22,7 +22,7 @@
 
 # 64-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2014-05-16"
+export DOWNLOAD_TAG="2014-06-05"
 export WIRESHARK_TARGET_PLATFORM="win64"
 
 WIN_SETUP=`echo $0 | sed -e s/win64/win/`

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index 13f5f82502867e7ab44de9cb12987d77cb10f0c7..5566eb9596ebbcdfec2865be179adc296afcc939 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -448,8 +448,11 @@ win32 {
         $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \
         $${GLIB_DIR}/bin/libgthread-2.0-0.dll $${GLIB_DIR}/bin/$${INTL_DLL} \
         $${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \
-        $${GNUTLS_DIR}/bin/libgcrypt-11.dll $${GNUTLS_DIR}/bin/libgnutls-26.dll \
-        $${GNUTLS_DIR}/bin/libgpg-error-0.dll $${GNUTLS_DIR}/bin/libtasn1-3.dll \
+        $${GNUTLS_DIR}/bin/libffi-6.dll $${GNUTLS_DIR}/bin/$$(GCC_DLL) \
+        $${GNUTLS_DIR}/bin/libgcrypt-20.dll $${GNUTLS_DIR}/bin/libgmp-10.dll \
+        $${GNUTLS_DIR}/bin/libgnutls-28.dll $${GNUTLS_DIR}/bin/$$(GPGERROR_DLL) \
+        $${GNUTLS_DIR}/bin/libhogweed-2-4.dll $${GNUTLS_DIR}/bin/libnettle-4-6.dll \
+        $${GNUTLS_DIR}/bin/libp11-kit-0.dll $${GNUTLS_DIR}/bin/libtasn1-6.dll \
         $${GNUTLS_DIR}/bin/libintl-8.dll $${SMI_DIR}/bin/libsmi-2.dll \
         $${LUA_DIR}/lua52.dll \
         $${GEOIP_DIR}/bin/libGeoIP-1.dll \