From: Martin Willi <martin@revosec.ch>
Date: Wed, 24 Jul 2013 11:19:57 +0000 (+0200)
Subject: charon-cmd: support prompting for a PIN
X-Git-Tag: 5.1.1dr3~23^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e8b36eb92f311a800079bda11bba6fdb1dfc003f;p=thirdparty%2Fstrongswan.git

charon-cmd: support prompting for a PIN

To support a Password and PIN XAuth combo, additionally support multiple
prompts for different credential types.
---

diff --git a/src/charon-cmd/cmd/cmd_creds.c b/src/charon-cmd/cmd/cmd_creds.c
index 526ff7c9cd..7fee85d789 100644
--- a/src/charon-cmd/cmd/cmd_creds.c
+++ b/src/charon-cmd/cmd/cmd_creds.c
@@ -48,9 +48,9 @@ struct private_cmd_creds_t {
 	callback_cred_t *cb;
 
 	/**
-	 * Already prompted for password?
+	 * Kind of secret we recently prompted
 	 */
-	bool prompted;
+	shared_key_type_t prompted;
 
 	/**
 	 * Path to ssh-agent socket
@@ -74,7 +74,7 @@ static shared_key_t* callback_shared(private_cmd_creds_t *this,
 	shared_key_t *shared;
 	char *label, *pwd;
 
-	if (this->prompted)
+	if (type == this->prompted)
 	{
 		return NULL;
 	}
@@ -89,6 +89,9 @@ static shared_key_t* callback_shared(private_cmd_creds_t *this,
 		case SHARED_PRIVATE_KEY_PASS:
 			label = "Password: ";
 			break;
+		case SHARED_PIN:
+			label = "PIN: ";
+			break;
 		default:
 			return NULL;
 	}
@@ -97,7 +100,7 @@ static shared_key_t* callback_shared(private_cmd_creds_t *this,
 	{
 		return NULL;
 	}
-	this->prompted = TRUE;
+	this->prompted = type;
 	if (match_me)
 	{
 		*match_me = ID_MATCH_PERFECT;
@@ -281,6 +284,7 @@ cmd_creds_t *cmd_creds_create()
 			.destroy = _destroy,
 		},
 		.creds = mem_cred_create(),
+		.prompted = SHARED_ANY,
 	);
 	this->cb = callback_cred_create_shared((void*)callback_shared, this);