From c47fcd1fdea20d274611a035ca9b59b3d701696b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 14 Aug 2017 12:40:23 +0100 Subject: [PATCH] Kill HAVE_GNUTLS_PK_TO_SIGN Signed-off-by: David Woodhouse --- configure.ac | 2 -- gnutls.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/configure.ac b/configure.ac index 3e39ec1e..138875a0 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_pk_to_sign, - [AC_DEFINE(HAVE_GNUTLS_PK_TO_SIGN, 1, [From GnuTLS 3.1.0])], []) AC_CHECK_FUNC(gnutls_pubkey_export2, [AC_DEFINE(HAVE_GNUTLS_PUBKEY_EXPORT2, 1, [From GnuTLS 3.1.3])], []) AC_CHECK_FUNC(gnutls_x509_crt_set_pin_function, diff --git a/gnutls.c b/gnutls.c index 4b9bc956..78232e8c 100644 --- a/gnutls.c +++ b/gnutls.c @@ -629,16 +629,12 @@ static int assign_privkey(struct openconnect_info *vpninfo, static int verify_signed_data(gnutls_pubkey_t pubkey, gnutls_privkey_t privkey, const gnutls_datum_t *data, const gnutls_datum_t *sig) { -#ifdef HAVE_GNUTLS_PK_TO_SIGN gnutls_sign_algorithm_t algo; algo = gnutls_pk_to_sign(gnutls_privkey_get_pk_algorithm(privkey, NULL), GNUTLS_DIG_SHA1); return gnutls_pubkey_verify_data2(pubkey, algo, 0, data, sig); -#else - return gnutls_pubkey_verify_data(pubkey, 0, data, sig); -#endif } #endif /* (P11KIT || TROUSERS || SYSTEM_KEYS) */ -- 2.50.1