DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2P: Use PSK format in WPS Credential

Browse source
This commit is contained in:
Jouni Malinen 2010-07-18 14:30:25 -07:00 • committed by Jouni Malinen
parent 6e3f4b89ea
commit f684e608af
7 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/eap_server/eap.h
View file

@ -106,6 +106,7 @@ struct eap_config {
int tnc;
struct wps_context *wps;
const struct wpabuf *assoc_wps_ie;
const struct wpabuf *assoc_p2p_ie;
const u8 *peer_addr;
int fragment_size;
};

1
src/eap_server/eap_i.h
View file

@ -183,6 +183,7 @@ struct eap_sm {
int tnc;
struct wps_context *wps;
struct wpabuf *assoc_wps_ie;
struct wpabuf *assoc_p2p_ie;
Boolean start_reauth;

3
src/eap_server/eap_server.c
View file

@ -1255,6 +1255,8 @@ struct eap_sm * eap_server_sm_init(void *eapol_ctx,
sm->wps = conf->wps;
if (conf->assoc_wps_ie)
sm->assoc_wps_ie = wpabuf_dup(conf->assoc_wps_ie);
if (conf->assoc_p2p_ie)
sm->assoc_p2p_ie = wpabuf_dup(conf->assoc_p2p_ie);
if (conf->peer_addr)
os_memcpy(sm->peer_addr, conf->peer_addr, ETH_ALEN);
sm->fragment_size = conf->fragment_size;
@ -1292,6 +1294,7 @@ void eap_server_sm_deinit(struct eap_sm *sm)
os_free(sm->eap_if.aaaEapKeyData);
eap_user_free(sm->user);
wpabuf_free(sm->assoc_wps_ie);
wpabuf_free(sm->assoc_p2p_ie);
os_free(sm);
}

7
src/eap_server/eap_server_wsc.c
View file

@ -135,8 +135,11 @@ static void * eap_wsc_init(struct eap_sm *sm)
}
cfg.assoc_wps_ie = sm->assoc_wps_ie;
cfg.peer_addr = sm->peer_addr;
if (0 /* TODO: could provide option for forcing PSK format */)
cfg.use_psk_key = 1;
if (sm->assoc_p2p_ie) {
wpa_printf(MSG_DEBUG, "EAP-WSC: Prefer PSK format for P2P "
"client");
cfg.use_psk_key = 1;
}
data->wps = wps_init(&cfg);
if (data->wps == NULL) {
os_free(data);