From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 9 Jun 2012 22:26:42 +0000 (+0100)
Subject: Cope with SSL key being PKCS#11 but cert from file
X-Git-Tag: v3.99~51
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=935e6e2e1287851a3567a4dc71d8bf445ce93154;p=users%2Fdwmw2%2Fopenconnect.git

Cope with SSL key being PKCS#11 but cert from file

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

diff --git a/gnutls.c b/gnutls.c
index f05ee36b..519f6e9a 100644
--- a/gnutls.c
+++ b/gnutls.c
@@ -431,7 +431,7 @@ static int load_certificate(struct openconnect_info *vpninfo)
 		return -EINVAL;
 	}
 
-	if (!strncmp(vpninfo->cert, "pkcs11:", 7)) {
+	if (!strncmp(vpninfo->sslkey, "pkcs11:", 7)) {
 		char *cert_url = (char *)vpninfo->cert;
 		char *key_url = (char *)vpninfo->sslkey;
 #ifdef HAVE_P11KIT
@@ -441,25 +441,14 @@ static int load_certificate(struct openconnect_info *vpninfo)
 		sprintf(pin_source, "openconnect:%p", vpninfo);
 
 		uri = p11_kit_uri_new();
-		if (p11_kit_uri_parse(vpninfo->cert, P11_KIT_URI_FOR_OBJECT, uri) != P11_KIT_URI_OK) {
-			vpn_progress(vpninfo, PRG_ERR, _("Failed to parse PKCS#11 URL '%s'\n"),
-				     vpninfo->cert);
-			p11_kit_uri_free(uri);
-			return -EINVAL;
-		}
-		if (!p11_kit_uri_get_pin_source(uri)) {
+		if (p11_kit_uri_parse(vpninfo->cert, P11_KIT_URI_FOR_OBJECT, uri) == P11_KIT_URI_OK
+		    && !p11_kit_uri_get_pin_source(uri)) {
 			p11_kit_uri_set_pin_source(uri, pin_source);
 			p11_kit_uri_format(uri, P11_KIT_URI_FOR_OBJECT, &cert_url);
 		}
 
-		if (p11_kit_uri_parse(vpninfo->sslkey, P11_KIT_URI_FOR_OBJECT, uri) != P11_KIT_URI_OK) {
-			vpn_progress(vpninfo, PRG_ERR, _("Failed to parse PKCS#11 URL '%s'\n"),
-				     vpninfo->sslkey);
-			p11_kit_uri_free(uri);
-			free(cert_url);
-			return -EINVAL;
-		}
-		if (!p11_kit_uri_get_pin_source(uri)) {
+		if (p11_kit_uri_parse(vpninfo->sslkey, P11_KIT_URI_FOR_OBJECT, uri) == P11_KIT_URI_OK
+		    && !p11_kit_uri_get_pin_source(uri)) {
 			p11_kit_uri_set_pin_source(uri, pin_source);
 			p11_kit_uri_format(uri, P11_KIT_URI_FOR_OBJECT, &key_url);
 		}