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

Changed Credential MAC Address to be BSSID in AP/Registrar

Browse source 
WPS spec is not very clear on which MAC address is used here, but BSSID
makes more sense than Enrollee MAC address.
This commit is contained in:
Jouni Malinen 2009-01-20 21:28:31 +02:00 committed by Jouni Malinen
parent 790ccdb2b3
commit 05bf32cc87
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wps/wps_registrar.c
View file

@ -905,7 +905,8 @@ static int wps_build_cred_network_key(struct wpabuf *msg,
static int wps_build_cred_mac_addr(struct wpabuf *msg, static int wps_build_cred_mac_addr(struct wpabuf *msg,
struct wps_credential *cred) struct wps_credential *cred)
{ {
wpa_printf(MSG_DEBUG, "WPS: * MAC Address"); wpa_printf(MSG_DEBUG, "WPS: * MAC Address (" MACSTR ")",
MAC2STR(cred->mac_addr));
wpabuf_put_be16(msg, ATTR_MAC_ADDR); wpabuf_put_be16(msg, ATTR_MAC_ADDR);
wpabuf_put_be16(msg, ETH_ALEN); wpabuf_put_be16(msg, ETH_ALEN);
wpabuf_put_data(msg, cred->mac_addr, ETH_ALEN); wpabuf_put_data(msg, cred->mac_addr, ETH_ALEN);
@ -979,7 +980,8 @@ static int wps_build_cred(struct wps_data *wps, struct wpabuf *msg)
} }
} }
wps->cred.encr_type = wps->encr_type; wps->cred.encr_type = wps->encr_type;
os_memcpy(wps->cred.mac_addr, wps->mac_addr_e, ETH_ALEN); /* Set MAC address in the Credential to be the AP's address (BSSID) */
os_memcpy(wps->cred.mac_addr, wps->wps->dev.mac_addr, ETH_ALEN);
if (wps->wps->wps_state == WPS_STATE_NOT_CONFIGURED && wps->wps->ap) { if (wps->wps->wps_state == WPS_STATE_NOT_CONFIGURED && wps->wps->ap) {
u8 r[16]; u8 r[16];