]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Avoid warning about verify_signed_data being unused
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 6 Mar 2013 21:34:55 +0000 (21:34 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 6 Mar 2013 21:37:04 +0000 (21:37 +0000)
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
gnutls.c

index 8e8e77862fc2da4a3ab95a671b6ce03ea548b17f..f67aa130fc1339a2ef4e1cfde340d6ce3d9fc792 100644 (file)
--- 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;