jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WPS: Process old AP Settings in M7 when registering as external Registrar

Browse source 
The old (i.e., currently used) AP Settings are processed. For now, they
are copied as-is into M8 as new AP Settings to avoid changing
configuration. This should be changed to allow external programs (e.g.,
GUI) to fetch the old AP settings over ctrl_iface and then allow
settings to be changed before sending M8 with the new settings.
This commit is contained in:
Jouni Malinen 2008-11-27 20:32:39 +02:00
parent fced73755f
commit 96a2ed9f50
2 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/eap_peer/eap_wsc.c
View file

@ -142,11 +142,8 @@ static void * eap_wsc_init(struct eap_sm *sm)
wps->cb_ctx = data; wps->cb_ctx = data;
/* TODO: configure.. */ wps->auth_types = WPS_AUTH_WPA2PSK | WPS_AUTH_WPAPSK;
wps->auth_types = WPS_AUTH_WPA2PSK; wps->encr_types = WPS_ENCR_AES | WPS_ENCR_TKIP;
wps->encr_types = WPS_ENCR_AES;
os_memcpy(wps->ssid, "test", 4);
wps->ssid_len = 4;
os_memset(&rcfg, 0, sizeof(rcfg)); os_memset(&rcfg, 0, sizeof(rcfg));
rcfg.new_psk_cb = eap_wsc_new_psk_cb; rcfg.new_psk_cb = eap_wsc_new_psk_cb;

38
src/wps/wps_registrar.c
View file

@ -1656,6 +1656,40 @@ static enum wps_process_res wps_process_m5(struct wps_data *wps,
} }
static int wps_process_ap_settings_r(struct wps_data *wps,
struct wps_parse_attr *attr)
{
struct wps_credential cred;
if (wps->wps->ap)
return 0;
/* AP Settings Attributes in M7 when Enrollee is an AP */
if (wps_process_ap_settings(attr, &cred) < 0)
return -1;
wpa_printf(MSG_INFO, "WPS: Received old AP configuration from AP");
/*
* TODO: Provide access to AP settings and allow changes before sending
* out M8. For now, just copy the settings unchanged into M8.
*/
wps->auth_type = cred.auth_type;
wps->encr_type = cred.encr_type;
os_memcpy(wps->wps->ssid, cred.ssid, cred.ssid_len);
wps->wps->ssid_len = cred.ssid_len;
os_memcpy(wps->mac_addr_e, cred.mac_addr, ETH_ALEN);
os_free(wps->wps->network_key);
wps->wps->network_key = os_malloc(cred.key_len);
if (wps->wps->network_key) {
os_memcpy(wps->wps->network_key, cred.key, cred.key_len);
wps->wps->network_key_len = cred.key_len;
}
return 0;
}
static enum wps_process_res wps_process_m7(struct wps_data *wps, static enum wps_process_res wps_process_m7(struct wps_data *wps,
const struct wpabuf *msg, const struct wpabuf *msg,
struct wps_parse_attr *attr) struct wps_parse_attr *attr)
@ -1687,10 +1721,12 @@ static enum wps_process_res wps_process_m7(struct wps_data *wps,
"attribute"); "attribute");
if (wps_parse_msg(decrypted, &eattr) < 0 || if (wps_parse_msg(decrypted, &eattr) < 0 ||
wps_process_key_wrap_auth(wps, decrypted, eattr.key_wrap_auth) || wps_process_key_wrap_auth(wps, decrypted, eattr.key_wrap_auth) ||
wps_process_e_snonce2(wps, eattr.e_snonce2)) { wps_process_e_snonce2(wps, eattr.e_snonce2) ||
wps_process_ap_settings_r(wps, &eattr)) {
wpabuf_free(decrypted); wpabuf_free(decrypted);
return WPS_FAILURE; return WPS_FAILURE;
} }
wpabuf_free(decrypted); wpabuf_free(decrypted);
wps->state = SEND_M8; wps->state = SEND_M8;