diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-01 13:23:52 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-10-02 20:49:58 +0000 |
| commit | 617b8260573a539ddb949613c5c768903785d107 (patch) | |
| tree | 3515906ab2a1572dabf94ec5ba522c1d73646bc4 | |
| parent | 5c8457ea684f7c03b6665dd9728fa077320ef5ae (diff) | |
Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 package
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys
Bug: 10476
Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e
Reviewed-on: https://code.wireshark.org/review/4401
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.nmake | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 758cf0b76e..8f25663a83 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1111,6 +1111,7 @@ clean_setup: 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 + rm -r -f gnutls-3.2.15-*-win??ws !IF "$(GTK_NAME)" == "gtk2" rm -r -f gtk2 !ELSE diff --git a/config.nmake b/config.nmake index d804079711..088aa50aee 100644 --- a/config.nmake +++ b/config.nmake @@ -242,7 +242,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2014-07-27 +DOWNLOAD_TAG=2014-10-01 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -417,7 +417,7 @@ C_ARES_PKG=1.9.1-1 # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=3.1.22-2.3 +GNUTLS_PKG=3.2.15-2.7 GPGERROR_DLL=libgpg-error-0.dll GCC_DLL=libgcc_s_sjlj-1.dll @@ -501,7 +501,7 @@ GEOIP_PKG=1.5.1-2 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2014-07-27 +DOWNLOAD_TAG=2014-10-01 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -666,7 +666,7 @@ C_ARES_PKG=1.9.1-1 # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=3.1.22-2.3 +GNUTLS_PKG=3.2.15-2.9 GPGERROR_DLL=libgpg-error6-0.dll GCC_DLL=libgcc_s_seh-1.dll |