Use gnutls_pubkey_verify_data2() only if we have gnutls_pk_to_sign()

We need gnutls_pk_to_sign(), and gnutls_pubkey_verify_data() wasn't
deprecated until that arrived. So it's the correct thing to check for,
instead of just checking for gnutls_pubkey_verify_data2() itself.

Thanks to Jörg Mayer for reporting the build failure on openSUSE 12.1
with GnuTLS 3.0.3.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/configure.ac b/configure.ac
index 7485db10f216b135880c3014ea47a0f63aa910f5..56d32b02d2f45cdeca966a6425c9c904cccf3a22 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -292,8 +292,8 @@ if test "$with_gnutls" = "yes"; then
                 [AC_DEFINE(HAVE_GNUTLS_PKCS12_SIMPLE_PARSE, 1)], [])
     AC_CHECK_FUNC(gnutls_certificate_set_key,
                 [AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_SET_KEY, 1)], [])
-    AC_CHECK_FUNC(gnutls_pubkey_verify_data2,
-                [AC_DEFINE(HAVE_GNUTLS_PUBKEY_VERIFY_DATA2, 1)], [])
+    AC_CHECK_FUNC(gnutls_pk_to_sign,
+                [AC_DEFINE(HAVE_GNUTLS_PK_TO_SIGN, 1)], [])
     if test "$with_openssl" = "" || test "$with_openssl" = "no"; then
        AC_CHECK_FUNC(gnutls_session_set_premaster,
                 [have_gnutls_dtls=yes], [have_gnutls_dtls=no])

diff --git a/gnutls.c b/gnutls.c
index 3cf72315719702b194fc9fca65888ed43827ed16..2b3b45f0258306bde49488be38dfcb1f0e348408 100644 (file)
--- a/gnutls.c
+++ b/gnutls.c
@@ -583,7 +583,7 @@ 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_PUBKEY_VERIFY_DATA2
+#ifdef HAVE_GNUTLS_PK_TO_SIGN
        gnutls_sign_algorithm_t algo = GNUTLS_SIGN_RSA_SHA1; /* TPM keys */
 
        if (privkey != OPENCONNECT_TPM_PKEY)