kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set base requirement of GnuTLS to >= 3.2.0

Browse Source
This commit is contained in:
Henrik Andersson 2019-01-24 12:35:39 +01:00
parent bc3a5789e4
commit eacecac99c
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -181,7 +181,7 @@ fi
# GnuTLS # GnuTLS
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
PKG_CHECK_MODULES(GNUTLS, gnutls >= 3.0.0, [HAVE_GNUTLS=1], [HAVE_GNUTLS=0]) PKG_CHECK_MODULES(GNUTLS, gnutls >= 3.2.0, [HAVE_GNUTLS=1], [HAVE_GNUTLS=0])
fi fi
if test x"$HAVE_GNUTLS" = "x1"; then if test x"$HAVE_GNUTLS" = "x1"; then
CFLAGS="$CFLAGS $GNUTLS_CFLAGS" CFLAGS="$CFLAGS $GNUTLS_CFLAGS"

10
tcp.c
View File

@ -531,16 +531,8 @@ tcp_tls_connect(void)
CHECK(gnutls_credentials_set(g_tls_session, GNUTLS_CRD_CERTIFICATE, xcred)); CHECK(gnutls_credentials_set(g_tls_session, GNUTLS_CRD_CERTIFICATE, xcred));
CHECK(gnutls_certificate_set_x509_system_trust(xcred)); CHECK(gnutls_certificate_set_x509_system_trust(xcred));
gnutls_certificate_set_verify_function(xcred, cert_verify_callback); gnutls_certificate_set_verify_function(xcred, cert_verify_callback);
#if GNUTLS_VERSION_NUMBER >= 0x030109
gnutls_transport_set_int(g_tls_session, g_sock); gnutls_transport_set_int(g_tls_session, g_sock);
#else
gnutls_transport_set_ptr(g_tls_session, (gnutls_transport_ptr_t)g_sock);
#endif
#if GNUTLS_VERSION_NUMBER >= 0x030100
gnutls_handshake_set_timeout(g_tls_session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); gnutls_handshake_set_timeout(g_tls_session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
#endif
/* Perform the TLS handshake */ /* Perform the TLS handshake */
do { do {
@ -574,12 +566,10 @@ tcp_tls_connect(void)
goto fail; goto fail;
} else { } else {
#if GNUTLS_VERSION_NUMBER >= 0x03010a
char *desc; char *desc;
desc = gnutls_session_get_desc(g_tls_session); desc = gnutls_session_get_desc(g_tls_session);
logger(Core, Verbose, "TLS Session info: %s\n", desc); logger(Core, Verbose, "TLS Session info: %s\n", desc);
gnutls_free(desc); gnutls_free(desc);
#endif
} }
return True; return True;