From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 22 Feb 2015 10:39:49 +0000 (+0100)
Subject: Use p11_kit_uri_get_pin_value() if available in p11-kit
X-Git-Tag: gnutls_3_4_0~286
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11d79ec133e1adeed3213cbd8642b2c0e07b41ee;p=thirdparty%2Fgnutls.git

Use p11_kit_uri_get_pin_value() if available in p11-kit
---

diff --git a/configure.ac b/configure.ac
index 202ad79f83..441031aaf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,9 @@ if test "$with_p11_kit" != "no"; then
 		else
 			GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, p11-kit-1"
 		fi
+		if $PKG_CONFIG --atleast-version=0.23.1 p11-kit; then
+			AC_DEFINE([P11_KIT_HAS_PIN_VALUE], 1, [p11-kit supports p11_kit_uri_get_pin_value()])
+		fi
 	else
 	        with_p11_kit=no
 	        AC_MSG_ERROR([[
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index c6431727a2..1c9f6dfea3 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -2213,13 +2213,26 @@ retrieve_pin(struct pin_info_st *pin_info, struct p11_kit_uri *info,
 	if (pin) {
 		*pin = NULL;
 
-		/* Check if a pinfile is specified, and use that if possible */
-		pinfile = p11_kit_uri_get_pin_source(info);
+		/* First check for pin-value field */
+#ifdef P11_KIT_HAS_PIN_VALUE
+		pinfile = p11_kit_uri_get_pin_value(info);
+#else
+		pinfile = NULL;
+#endif
 		if (pinfile != NULL) {
-			_gnutls_debug_log("p11: Using pinfile to retrieve PIN\n");
-			ret =
-			    retrieve_pin_from_source(pinfile, token_info, attempts,
-						     user_type, pin);
+			_gnutls_debug_log("p11: Using pin-value to retrieve PIN\n");
+			*pin = p11_kit_pin_new_for_string(pinfile);
+			if (*pin != NULL)
+				ret = 0;
+		} else { /* try pin-source */
+			/* Check if a pinfile is specified, and use that if possible */
+			pinfile = p11_kit_uri_get_pin_source(info);
+			if (pinfile != NULL) {
+				_gnutls_debug_log("p11: Using pin-source to retrieve PIN\n");
+				ret =
+				    retrieve_pin_from_source(pinfile, token_info, attempts,
+							     user_type, pin);
+			}
 		}
 	}