aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-02-03 17:49:38 (GMT)
committerJouni Malinen <j@w1.fi>2008-02-03 17:49:38 (GMT)
commitba2c1028d20d313994213ad3ada7779af63bf59e (patch)
tree6fbf549d41f0dcc33d566ee220d51628b42adfd3
parent5cb4201fa7d808c3e0bb7e82d9de26d7e70fcc6b (diff)
downloadhostap-history-ba2c1028d20d313994213ad3ada7779af63bf59e.zip
hostap-history-ba2c1028d20d313994213ad3ada7779af63bf59e.tar.gz
hostap-history-ba2c1028d20d313994213ad3ada7779af63bf59e.tar.bz2
Allow * wildcard to be used for Phase 2 EAP identities
-rw-r--r--hostapd/config.c2
-rw-r--r--hostapd/hostapd.eap_user8
2 files changed, 9 insertions, 1 deletions
diff --git a/hostapd/config.c b/hostapd/config.c
index e151275..7046cda 100644
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -2293,7 +2293,7 @@ hostapd_get_eap_user(const struct hostapd_bss_config *conf, const u8 *identity,
break;
}
- if (!phase2 && user->wildcard_prefix &&
+ if (user->phase2 == !!phase2 && user->wildcard_prefix &&
identity_len >= user->identity_len &&
os_memcmp(user->identity, identity, user->identity_len) ==
0) {
diff --git a/hostapd/hostapd.eap_user b/hostapd/hostapd.eap_user
index 7d7b58d..ac9a5d8 100644
--- a/hostapd/hostapd.eap_user
+++ b/hostapd/hostapd.eap_user
@@ -81,3 +81,11 @@
"user" MD5,GTC,MSCHAPV2 "password" [2]
"test user" MSCHAPV2 hash:000102030405060708090a0b0c0d0e0f [2]
"ttls-user" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,TTLS-MSCHAPV2 "password" [2]
+
+# Default to EAP-SIM and EAP-AKA based on fixed identity prefixes in phase 2
+"0"* AKA [2]
+"1"* SIM [2]
+"2"* AKA [2]
+"3"* SIM [2]
+"4"* AKA [2]
+"5"* SIM [2]