From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 9 Jun 2012 22:22:54 +0000 (+0100)
Subject: Fix error handling when GnuTLS can't open key file
X-Git-Tag: v3.99~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63c870c01d82fcc5ebc5abcd76361930dce9732c;p=platform%2Fupstream%2Fopenconnect.git

Fix error handling when GnuTLS can't open key file

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

diff --git a/gnutls.c b/gnutls.c
index 7476564..f05ee36 100644
--- a/gnutls.c
+++ b/gnutls.c
@@ -239,15 +239,15 @@ static int load_datum(struct openconnect_info *vpninfo,
 	if (fd == -1) {
 		err = errno;
 		vpn_progress(vpninfo, PRG_ERR,
-			     _("Failed to open certificate file %s: %s\n"),
-			     vpninfo->cert, strerror(err));
+			     _("Failed to open key/certificate file %s: %s\n"),
+			     fname, strerror(err));
 		return -ENOENT;
 	}
 	if (fstat(fd, &st)) {
 		err = errno;
 		vpn_progress(vpninfo, PRG_ERR,
-			     _("Failed to stat certificate file %s: %s\n"),
-			     vpninfo->cert, strerror(err));
+			     _("Failed to stat key/certificate file %s: %s\n"),
+			     fname, strerror(err));
 		close(fd);
 		return -EIO;
 	}
@@ -423,6 +423,8 @@ static int load_certificate(struct openconnect_info *vpninfo)
 	unsigned char key_id[20];
 	size_t key_id_size = sizeof(key_id);
 
+	fdata.data = NULL;
+
 	if (vpninfo->cert_type == CERT_TYPE_TPM) {
 		vpn_progress(vpninfo, PRG_ERR,
 			     _("TPM support not available with GnuTLS\n"));
@@ -546,9 +548,10 @@ static int load_certificate(struct openconnect_info *vpninfo)
 
 	if (vpninfo->sslkey != vpninfo->cert) {
 		gnutls_free(fdata.data);
+		fdata.data = NULL;
 
 		vpn_progress(vpninfo, PRG_TRACE,
-			     _("Using private key file %s\n"), vpninfo->cert);
+			     _("Using private key file %s\n"), vpninfo->sslkey);
 
 		ret = load_datum(vpninfo, &fdata, vpninfo->sslkey);
 		if (ret)