From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 18 Jun 2012 19:06:36 +0000 (+0100)
Subject: Fix PKCS#11 cleanup when no SSL certificate is set
X-Git-Tag: v4.00~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2d08bf0a90682b03254e5e73522ddc52ef0b11e5;p=users%2Fdwmw2%2Fopenconnect.git

Fix PKCS#11 cleanup when no SSL certificate is set

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

diff --git a/gnutls.c b/gnutls.c
index b4034d01..d3d24352 100644
--- a/gnutls.c
+++ b/gnutls.c
@@ -1515,8 +1515,8 @@ void openconnect_close_https(struct openconnect_info *vpninfo, int final)
 		gnutls_certificate_free_credentials(vpninfo->https_cred);
 		vpninfo->https_cred = NULL;
 #ifdef HAVE_P11KIT
-		if (!strncmp(vpninfo->cert, "pkcs11:", 7) ||
-		    !strncmp(vpninfo->sslkey, "pkcs11:", 7)) {
+		if ((vpninfo->cert && !strncmp(vpninfo->cert, "pkcs11:", 7)) ||
+		    (vpninfo->sslkey && !strncmp(vpninfo->sslkey, "pkcs11:", 7))) {
 			char pin_source[40];
 
 			sprintf(pin_source, "openconnect:%p", vpninfo);