Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Kill HAVE_GNUTLS_PKCS11_GET_RAW_ISSUER
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
dwmw2 committed Aug 14, 2017
1 parent 881dcb2 commit 266a393
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions configure.ac
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gnutls.c
Expand Up @@ -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;

Expand Down

0 comments on commit 266a393

Please sign in to comment.