aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-02-03 03:54:17 (GMT)
committerJouni Malinen <j@w1.fi>2008-02-03 03:54:17 (GMT)
commit5cb4201fa7d808c3e0bb7e82d9de26d7e70fcc6b (patch)
treec8416f6421bf1976de1cd2a7d7d0f6ee4a34147d
parentc789f95d039b97b27dc22189dfb74bdbd3ea055d (diff)
downloadhostap-history-5cb4201fa7d808c3e0bb7e82d9de26d7e70fcc6b.zip
hostap-history-5cb4201fa7d808c3e0bb7e82d9de26d7e70fcc6b.tar.gz
hostap-history-5cb4201fa7d808c3e0bb7e82d9de26d7e70fcc6b.tar.bz2
Fixed EAP-SIM Start/Response message for fast reauthentication
Do not include AT_NONCE_MT and AT_SELECTED_VERSION attributes in EAP-SIM Start/Response when using fast reauthentication. These attributes are only used for full authentication.
-rw-r--r--src/eap_peer/eap_sim.c18
-rw-r--r--wpa_supplicant/ChangeLog2
2 files changed, 12 insertions, 8 deletions
diff --git a/src/eap_peer/eap_sim.c b/src/eap_peer/eap_sim.c
index 69af7d0..c89eddd 100644
--- a/src/eap_peer/eap_sim.c
+++ b/src/eap_peer/eap_sim.c
@@ -311,14 +311,16 @@ static struct wpabuf * eap_sim_response_start(struct eap_sm *sm,
wpa_printf(MSG_DEBUG, "Generating EAP-SIM Start (id=%d)", id);
msg = eap_sim_msg_init(EAP_CODE_RESPONSE, id,
EAP_TYPE_SIM, EAP_SIM_SUBTYPE_START);
- wpa_hexdump(MSG_DEBUG, " AT_NONCE_MT",
- data->nonce_mt, EAP_SIM_NONCE_MT_LEN);
- eap_sim_msg_add(msg, EAP_SIM_AT_NONCE_MT, 0,
- data->nonce_mt, EAP_SIM_NONCE_MT_LEN);
- wpa_printf(MSG_DEBUG, " AT_SELECTED_VERSION %d",
- data->selected_version);
- eap_sim_msg_add(msg, EAP_SIM_AT_SELECTED_VERSION,
- data->selected_version, NULL, 0);
+ if (!data->reauth) {
+ wpa_hexdump(MSG_DEBUG, " AT_NONCE_MT",
+ data->nonce_mt, EAP_SIM_NONCE_MT_LEN);
+ eap_sim_msg_add(msg, EAP_SIM_AT_NONCE_MT, 0,
+ data->nonce_mt, EAP_SIM_NONCE_MT_LEN);
+ wpa_printf(MSG_DEBUG, " AT_SELECTED_VERSION %d",
+ data->selected_version);
+ eap_sim_msg_add(msg, EAP_SIM_AT_SELECTED_VERSION,
+ data->selected_version, NULL, 0);
+ }
if (identity) {
wpa_hexdump_ascii(MSG_DEBUG, " AT_IDENTITY",
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 1a14083..3355d3e 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -19,6 +19,8 @@ ChangeLog for wpa_supplicant
* added new ctrl_iface command, BSS, to allow scan results to be
fetched without hitting the message size limits (this command
can be used to iterate through the scan results one BSS at the time)
+ * fixed EAP-SIM not to include AT_NONCE_MT and AT_SELECTED_VERSION
+ attributes in EAP-SIM Start/Response when using fast reauthentication
2008-01-01 - v0.6.2
* added support for Makefile builds to include debug-log-to-a-file