From ad094132249c64d3a1d36eab2ec4e1346b2d9a61 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 14 Aug 2017 12:50:01 +0100 Subject: [PATCH] Kill HAVE_GNUTLS_URL_IS_SUPPORTED Signed-off-by: David Woodhouse --- configure.ac | 2 -- gnutls.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac index dab503f6..e1137283 100644 --- a/configure.ac +++ b/configure.ac @@ -452,8 +452,6 @@ case "$ssl_library" in CFLAGS="$CFLAGS $GNUTLS_CFLAGS" esp=yes dtls=yes - AC_CHECK_FUNC(gnutls_url_is_supported, - [AC_DEFINE(HAVE_GNUTLS_URL_IS_SUPPORTED, 1, [From GnuTLS 3.1.0])], []) AC_CHECK_FUNC(gnutls_system_key_add_x509, [AC_DEFINE(HAVE_GNUTLS_SYSTEM_KEYS, 1, [From GnuTLS 3.4.0])], []) AC_CHECK_FUNC(gnutls_pkcs11_add_provider, diff --git a/gnutls.c b/gnutls.c index 59a44705..baf1cd14 100644 --- a/gnutls.c +++ b/gnutls.c @@ -938,15 +938,9 @@ static int load_certificate(struct openconnect_info *vpninfo) key_is_p11 = !strncmp(vpninfo->sslkey, "pkcs11:", 7); cert_is_p11 = !strncmp(vpninfo->cert, "pkcs11:", 7); -#ifdef HAVE_GNUTLS_URL_IS_SUPPORTED /* GnuTLS returns true for pkcs11:, tpmkey:, system:, and custom URLs. */ key_is_sys = !key_is_p11 && gnutls_url_is_supported(vpninfo->sslkey); cert_is_sys = !cert_is_p11 && gnutls_url_is_supported(vpninfo->cert); -#else - /* Fallback for GnuTLS < 3.1.0. */ - key_is_sys = !strncmp(vpninfo->sslkey, "system:", 7); - cert_is_sys = !strncmp(vpninfo->cert, "system:", 7); -#endif #ifndef HAVE_GNUTLS_SYSTEM_KEYS if (key_is_sys || cert_is_sys) { -- 2.49.0