diff options
| author | Jouni Malinen <j@w1.fi> | 2008-11-26 20:47:24 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2008-11-26 20:47:24 +0200 |
| commit | f855f923a735c38b0ec918f3302173bf3e8e7a7f (patch) | |
| tree | b43ddb34a95893a58abea6f24c7ab4033ec89b36 /src/eap_peer/eap_wsc.c | |
| parent | 2f4eb314547bcbeea9a4b89c0d20cf6a2fb553cc (diff) | |
| download | external_wpa_supplicant_8_ti-f855f923a735c38b0ec918f3302173bf3e8e7a7f.zip external_wpa_supplicant_8_ti-f855f923a735c38b0ec918f3302173bf3e8e7a7f.tar.gz external_wpa_supplicant_8_ti-f855f923a735c38b0ec918f3302173bf3e8e7a7f.tar.bz2 | |
WPS: Moved UUID configuration from phase1 into global config area
Diffstat (limited to 'src/eap_peer/eap_wsc.c')
| -rw-r--r-- | src/eap_peer/eap_wsc.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/eap_peer/eap_wsc.c b/src/eap_peer/eap_wsc.c index e80b7c6..669f336 100644 --- a/src/eap_peer/eap_wsc.c +++ b/src/eap_peer/eap_wsc.c @@ -107,7 +107,6 @@ static void * eap_wsc_init(struct eap_sm *sm) size_t identity_len; int registrar; struct wps_config cfg; - u8 uuid[UUID_LEN]; const char *pos; const char *phase1; struct wps_context *wps = NULL; @@ -201,23 +200,10 @@ static void * eap_wsc_init(struct eap_sm *sm) return NULL; } - pos = os_strstr(phase1, "uuid="); - if (pos == NULL) { - wpa_printf(MSG_INFO, "EAP-WSC: UUID not set in phase1 " - "configuration data"); - os_free(data); - return NULL; - } - if (uuid_str2bin(pos + 5, uuid)) { - wpa_printf(MSG_INFO, "EAP-WSC: Invalid UUID in phase1 " - "configuration data"); - os_free(data); - return NULL; - } if (registrar && wps) - os_memcpy(wps->uuid, uuid, UUID_LEN); + os_memcpy(wps->uuid, sm->uuid, UUID_LEN); else - cfg.uuid = uuid; + cfg.uuid = sm->uuid; cfg.wps_cred_cb = sm->eapol_cb->wps_cred; cfg.cb_ctx = sm->eapol_ctx; data->wps = wps_init(&cfg); |