Kill HAVE_GNUTLS_URL_IS_SUPPORTED

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/configure.ac b/configure.ac
index dab503f6baf5540cf9caeb7a9a87546e479e6d94..e11372836bd76d9f7bc4926e06d43953ecfc673e 100644 (file)
--- 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 59a447057e338bd1bc280e4d9450a923eb5a132c..baf1cd1412f9ab7352615b133e600416b57534a1 100644 (file)
--- 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) {