]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Fix build with GnuTLS 2.12
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 13 Jun 2012 20:41:42 +0000 (21:41 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 13 Jun 2012 20:41:42 +0000 (21:41 +0100)
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
gnutls.c

index 8de040314c06c1661a20e4236c4e44d8ffcb7e97..6fcdd3f9d2781568034932c3518b2b2856ebf0d3 100644 (file)
--- a/gnutls.c
+++ b/gnutls.c
@@ -1250,12 +1250,12 @@ static int load_certificate(struct openconnect_info *vpninfo)
        }
        gnutls_free(extra_certs);
        gnutls_free(supporting_certs);
-       if (fdata.data != dummy_hash_data)
-               gnutls_free(fdata.data);
 #ifdef HAVE_GNUTLS_CERTIFICATE_SET_KEY
        if (pkey)
                gnutls_privkey_deinit(pkey);
-#endif
+       if (fdata.data != dummy_hash_data)
+#endif /* It's conditional if we support arbitrary privkeys: */
+               gnutls_free(fdata.data);
 #ifdef HAVE_P11KIT
        if (cert_url != vpninfo->cert)
                free(cert_url);