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/libhydra/attributes/attributes.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/libhydra/attributes/attributes.c')
| -rw-r--r-- | src/libhydra/attributes/attributes.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/libhydra/attributes/attributes.c b/src/libhydra/attributes/attributes.c index d8490b7f5..9fabcf4e4 100644 --- a/src/libhydra/attributes/attributes.c +++ b/src/libhydra/attributes/attributes.c @@ -87,28 +87,28 @@ ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, HOME_ "HOA"); ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, HOME_AGENT_ADDRESS, "X_TYPE", - "X_USER_NAME", - "X_USER_PASSWORD", - "X_PASSCODE", - "X_MESSAGE", - "X_CHALLENGE", + "X_USER", + "X_PWD", + "X_CODE", + "X_MSG", + "X_CHALL", "X_DOMAIN", "X_STATUS", - "X_NEXT_PIN", + "X_PIN", "X_ANSWER"); ENUM_NEXT(configuration_attribute_type_short_names, INTERNAL_IP4_SERVER, INTERNAL_IP6_SERVER, XAUTH_ANSWER, "SRV", "SRV6"); ENUM_NEXT(configuration_attribute_type_short_names, UNITY_BANNER, UNITY_DDNS_HOSTNAME, INTERNAL_IP6_SERVER, "U_BANNER", - "U_SAVE_PASSWD", - "U_DEF_DOMAIN", - "U_SPLITDNS_NAME", - "U_SPLIT_INCLUDE", - "U_NATT_PORT", - "U_LOCAL_LAN", + "U_SAVEPWD", + "U_DEFDOM", + "U_SPLITDNS", + "U_SPLITINC", + "U_NATTPORT", + "U_LOCALLAN", "U_PFS", - "U_FW_TYPE", - "U_BACKUP_SERVERS", - "U_DDNS_HOSTNAME"); + "U_FWTYPE", + "U_BKPSRV", + "U_DDNSHOST"); ENUM_END(configuration_attribute_type_short_names, UNITY_DDNS_HOSTNAME); |