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

WPS: Cleanup UUID and MAC address configuration

Browse source 
No need to configure these separately for each Enrollee in wps_config
since wps_context is now used both for Registrar and Enrollee.
This commit is contained in:
Jouni Malinen 2009-01-01 22:56:02 +02:00
parent e834272f73
commit 84f5b41fc1
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eap_peer/eap_wsc.c
View file

@ -162,7 +162,6 @@ static void * eap_wsc_init(struct eap_sm *sm)
cfg.authenticator = 0; cfg.authenticator = 0;
cfg.wps = wps; cfg.wps = wps;
cfg.registrar = registrar ? data->wps_ctx->registrar : NULL; cfg.registrar = registrar ? data->wps_ctx->registrar : NULL;
cfg.enrollee_mac_addr = registrar ? NULL : wps->dev.mac_addr;
phase1 = eap_get_config_phase1(sm); phase1 = eap_get_config_phase1(sm);
if (phase1 == NULL) { if (phase1 == NULL) {
@ -192,7 +191,6 @@ static void * eap_wsc_init(struct eap_sm *sm)
return NULL; return NULL;
} }
cfg.uuid = registrar ? NULL : wps->uuid;
data->wps = wps_init(&cfg); data->wps = wps_init(&cfg);
if (data->wps == NULL) { if (data->wps == NULL) {
os_free(data); os_free(data);

10
src/wps/wps.c
View file

@ -28,11 +28,11 @@ struct wps_data * wps_init(const struct wps_config *cfg)
data->authenticator = cfg->authenticator; data->authenticator = cfg->authenticator;
data->wps = cfg->wps; data->wps = cfg->wps;
data->registrar = cfg->registrar; data->registrar = cfg->registrar;
if (cfg->enrollee_mac_addr) if (cfg->registrar) {
os_memcpy(data->mac_addr_e, cfg->enrollee_mac_addr, ETH_ALEN); os_memcpy(data->uuid_r, cfg->wps->uuid, WPS_UUID_LEN);
if (cfg->uuid) { } else {
os_memcpy(cfg->registrar ? data->uuid_r : data->uuid_e, os_memcpy(data->mac_addr_e, cfg->wps->dev.mac_addr, ETH_ALEN);
cfg->uuid, WPS_UUID_LEN); os_memcpy(data->uuid_e, cfg->wps->uuid, WPS_UUID_LEN);
} }
if (cfg->pin) { if (cfg->pin) {
data->dev_pw_id = DEV_PW_DEFAULT; data->dev_pw_id = DEV_PW_DEFAULT;

2
src/wps/wps.h
View file

@ -55,11 +55,9 @@ struct wps_config {
int authenticator; int authenticator;
struct wps_context *wps; struct wps_context *wps;
struct wps_registrar *registrar; /* NULL for Enrollee */ struct wps_registrar *registrar; /* NULL for Enrollee */
const u8 *enrollee_mac_addr; /* NULL for Registrar */
const u8 *pin; /* Enrollee Device Password (NULL for Registrar or PBC) const u8 *pin; /* Enrollee Device Password (NULL for Registrar or PBC)
*/ */
size_t pin_len; size_t pin_len;
const u8 *uuid; /* 128-bit Enrollee UUID (NULL for Registrar) */
int pbc; int pbc;
const struct wpabuf *assoc_wps_ie; /* (Re)AssocReq WPS IE (in AP) */ const struct wpabuf *assoc_wps_ie; /* (Re)AssocReq WPS IE (in AP) */
}; };

1
src/wps/wps_registrar.c
View file

@ -980,7 +980,6 @@ static struct wpabuf * wps_build_m2(struct wps_data *wps)
return NULL; return NULL;
wpa_hexdump(MSG_DEBUG, "WPS: Registrar Nonce", wpa_hexdump(MSG_DEBUG, "WPS: Registrar Nonce",
wps->nonce_r, WPS_NONCE_LEN); wps->nonce_r, WPS_NONCE_LEN);
os_memcpy(wps->uuid_r, wps->wps->uuid, WPS_UUID_LEN);
wpa_hexdump(MSG_DEBUG, "WPS: UUID-R", wps->uuid_r, WPS_UUID_LEN); wpa_hexdump(MSG_DEBUG, "WPS: UUID-R", wps->uuid_r, WPS_UUID_LEN);
wpa_printf(MSG_DEBUG, "WPS: Building Message M2"); wpa_printf(MSG_DEBUG, "WPS: Building Message M2");