osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

gnutls: Bump version to 3.5.8 

Bum the minimum version of GnuTLS to 3.5.8, which was the first stable
release in the 3.5 series. All the currently supported Linux
distributions have a version at least this new.
This commit is contained in:
John Thacker 2022-04-22 20:54:16 -04:00 committed by A Wireshark GitLab Utility
parent 1ee8ead845
commit d2064ae188
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1256,7 +1256,7 @@ reset_find_package(SMI SMI_SHARE_DIR)
ws_find_package(SMI ENABLE_SMI HAVE_LIBSMI)
# Support for TLS decryption using RSA private keys.
ws_find_package(GNUTLS ENABLE_GNUTLS HAVE_LIBGNUTLS "3.3.0")
ws_find_package(GNUTLS ENABLE_GNUTLS HAVE_LIBGNUTLS "3.5.8")
# Kerberos
ws_find_package(KERBEROS ENABLE_KERBEROS HAVE_KERBEROS)
@ -1357,7 +1357,7 @@ add_custom_target(dist
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
if(GNUTLS_FOUND AND NOT GNUTLS_VERSION VERSION_LESS "3.4.0")
if(GNUTLS_FOUND)
# Calculating public keys from PKCS #11 private keys requires GnuTLS
# 3.4.0 or greater.
#

3
epan/secrets.c
View File

@ -28,9 +28,6 @@
# include <wsutil/report_message.h>
# include <wsutil/file_util.h>
# include <errno.h>
# if GNUTLS_VERSION_NUMBER < 0x030401
# define GNUTLS_KEYID_USE_SHA1 0
# endif
#endif /* HAVE_LIBGNUTLS */
/** Maps guint32 secrets_type -> secrets_block_callback_t. */