From 79493852b56873066a853b8b6450644090bfdc94 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 11 Jul 2012 18:13:34 +0100
Subject: [PATCH] Fix endless loop when multiple PKCS#11 tokens need PINs

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 gnutls.c          | 7 ++++---
 www/changelog.xml | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnutls.c b/gnutls.c
index 37e2ff4..ac3674c 100644
--- a/gnutls.c
+++ b/gnutls.c
@@ -1963,7 +1963,7 @@ static P11KitPin *pin_callback(const char *pin_source, P11KitUri *pin_uri,
 
 	if (p11_kit_uri_format(pin_uri, P11_KIT_URI_FOR_TOKEN, &uri))
 		return NULL;
-	
+
 	while (*cache) {
 		if (!strcmp(uri, (*cache)->token)) {
 			free(uri);
@@ -1977,6 +1977,7 @@ static P11KitPin *pin_callback(const char *pin_source, P11KitUri *pin_uri,
 			}
 			break;
 		}
+		cache = &(*cache)->next;
 	}
 	if (!*cache) {
 		*cache = calloc(1, sizeof(struct pin_cache));
@@ -1994,8 +1995,8 @@ static P11KitPin *pin_callback(const char *pin_source, P11KitUri *pin_uri,
 	message[sizeof(message)-1] = 0;
 	snprintf(message, sizeof(message) - 1, _("PIN required for %s"), pin_description);
 	f.message = message;
-	
-	/* 
+
+	/*
 	 * In p11-kit <= 0.12, these flags are *odd*.
 	 * RETRY is 0xa, FINAL_TRY is 0x14 and MANY_TRIES is 0x28.
 	 * So don't treat it like a sane bitmask. Fixed in
diff --git a/www/changelog.xml b/www/changelog.xml
index e73e78d..8725892 100644
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -17,6 +17,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
+       <li>Fix endless loop in PIN cache handling with multiple PKCS#11 tokens.</li>
        <li>Fix PKCS#11 URI handling to preserve all attributes.</li>
        <li>Don't forget key password on GUI reconnect.</li>
        <li>Fix GnuTLS v3 build on OpenBSD.</li>
-- 
2.7.4