diff options
| author | Martin Willi <martin@revosec.ch> | 2013-09-03 16:32:27 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-09-03 16:36:25 +0200 |
| commit | 478f9e772b967ab1811d02f7483dcfb559e973bb (patch) | |
| tree | da100b5212cdac16220e17c5f985b984b6c2dde0 /src/charon-cmd/cmd/cmd_creds.c | |
| parent | 7a425fb24ca9c80ff1c5a9e842f1cb72c637d2b0 (diff) | |
| parent | e8b36eb92f311a800079bda11bba6fdb1dfc003f (diff) | |
| download | strongswan-478f9e772b967ab1811d02f7483dcfb559e973bb.tar.bz2 strongswan-478f9e772b967ab1811d02f7483dcfb559e973bb.tar.xz | |
Merge branch 'xauth-radius-multi'
Introduces multiple rounds in the eap-radius XAuth backend, concatenating
answers to a single password to verify using a RADIUS User-Password attribute.
This is known to work fine with iOS and OS X clients, allowing two-factor
authentication with proper dialogs.
Different XAuth "profiles" for each backend can be selected using a generic
colon sperated suffix for the XAuth string.
Diffstat (limited to 'src/charon-cmd/cmd/cmd_creds.c')
| -rw-r--r-- | src/charon-cmd/cmd/cmd_creds.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/charon-cmd/cmd/cmd_creds.c b/src/charon-cmd/cmd/cmd_creds.c index 526ff7c9c..7fee85d78 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); |