From 7a5823bb23fa39ad870b91cf3ec4a7dadbd7dd0c Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Wed, 6 Mar 2013 21:34:55 +0000 Subject: [PATCH] Avoid warning about verify_signed_data being unused Signed-off-by: David Woodhouse --- gnutls.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnutls.c b/gnutls.c index 8e8e7786..f67aa130 100644 --- a/gnutls.c +++ b/gnutls.c @@ -579,6 +579,22 @@ static int assign_privkey(struct openconnect_info *vpninfo, return err; } #endif /* !SET_KEY */ + +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 + gnutls_sign_algorithm_t algo = GNUTLS_SIGN_RSA_SHA1; /* TPM keys */ + + if (privkey != OPENCONNECT_TPM_PKEY) + 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) */ static int openssl_hash_password(struct openconnect_info *vpninfo, char *pass, @@ -864,22 +880,6 @@ static int import_openssl_pem(struct openconnect_info *vpninfo, return ret; } -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 - gnutls_sign_algorithm_t algo = GNUTLS_SIGN_RSA_SHA1; /* TPM keys */ - - if (privkey != OPENCONNECT_TPM_PKEY) - 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 -} - static int load_certificate(struct openconnect_info *vpninfo) { gnutls_datum_t fdata;