Kill HAVE_GNUTLS_PKCS11_GET_RAW_ISSUER

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

diff --git a/configure.ac b/configure.ac
index f48ea1fb43266b586397c15686c9953e79b11c7a..7eed841a996371a566a8ff1a39404e97ac51f8d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -450,8 +450,6 @@ case "$ssl_library" in
        oldcflags="$CFLAGS"
        LIBS="$LIBS $GNUTLS_LIBS"
        CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
-       AC_CHECK_FUNC(gnutls_pkcs11_get_raw_issuer,
-                     [AC_DEFINE(HAVE_GNUTLS_PKCS11_GET_RAW_ISSUER, 1, [From GnuTLS 3.2.7])], [])
        AC_CHECK_FUNC(gnutls_certificate_set_x509_system_trust,
                      [AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST, 1, [From GnuTLS 3.0.20])], [])
        if test "$ac_cv_func_gnutls_certificate_set_x509_system_trust" != "yes"; then

diff --git a/gnutls.c b/gnutls.c
index ea96cef546cb4ad16efd3b55b98dcbf8011a207c..aeae229e672be24d3c9519ad35e6ab73fac4d0be 100644 (file)
--- a/gnutls.c
+++ b/gnutls.c
@@ -1751,7 +1751,7 @@ static int load_certificate(struct openconnect_info *vpninfo)
                        }
                        free_issuer = 0;
 
-#if defined(HAVE_P11KIT) && defined(HAVE_GNUTLS_PKCS11_GET_RAW_ISSUER)
+#ifdef HAVE_P11KIT
                        if (err && cert_is_p11) {
                                gnutls_datum_t t;