diff --git a/configure.ac b/configure.ac index 51eb995..faf7281 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,7 @@ fi # GnuTLS 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 if test x"$HAVE_GNUTLS" = "x1"; then CFLAGS="$CFLAGS $GNUTLS_CFLAGS" diff --git a/tcp.c b/tcp.c index c2cd941..052b880 100644 --- a/tcp.c +++ b/tcp.c @@ -531,16 +531,8 @@ tcp_tls_connect(void) CHECK(gnutls_credentials_set(g_tls_session, GNUTLS_CRD_CERTIFICATE, xcred)); CHECK(gnutls_certificate_set_x509_system_trust(xcred)); gnutls_certificate_set_verify_function(xcred, cert_verify_callback); - -#if GNUTLS_VERSION_NUMBER >= 0x030109 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); -#endif /* Perform the TLS handshake */ do { @@ -574,12 +566,10 @@ tcp_tls_connect(void) goto fail; } else { -#if GNUTLS_VERSION_NUMBER >= 0x03010a char *desc; desc = gnutls_session_get_desc(g_tls_session); logger(Core, Verbose, "TLS Session info: %s\n", desc); gnutls_free(desc); -#endif } return True;