From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 13 Jun 2012 20:41:42 +0000 (+0100)
Subject: Fix build with GnuTLS 2.12
X-Git-Tag: v3.99~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca40f7c5d70d5250dfeede19f2b769ef261ed3da;p=users%2Fdwmw2%2Fopenconnect.git

Fix build with GnuTLS 2.12

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

diff --git a/gnutls.c b/gnutls.c
index 8de04031..6fcdd3f9 100644
--- 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);