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

WPS: Add BSSID to strict validation error messages

Browse source 
This makes it easier to figure out which AP is sending invalid
Beacon or Probe Response frames.
This commit is contained in:
Jouni Malinen 2010-09-20 14:54:22 -07:00 committed by Jouni Malinen
parent e0369e3664
commit ff28ccafd5
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wps/wps.h
View file

@ -763,7 +763,8 @@ u16 wps_config_methods_str2bin(const char *str);
#ifdef CONFIG_WPS_STRICT #ifdef CONFIG_WPS_STRICT
int wps_validate_beacon(const struct wpabuf *wps_ie); int wps_validate_beacon(const struct wpabuf *wps_ie);
int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe); int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe,
const u8 *addr);
int wps_validate_probe_req(const struct wpabuf *wps_ie); int wps_validate_probe_req(const struct wpabuf *wps_ie);
int wps_validate_assoc_req(const struct wpabuf *wps_ie); int wps_validate_assoc_req(const struct wpabuf *wps_ie);
int wps_validate_assoc_resp(const struct wpabuf *wps_ie); int wps_validate_assoc_resp(const struct wpabuf *wps_ie);
@ -791,7 +792,7 @@ static inline int wps_validate_beacon(const struct wpabuf *wps_ie){
} }
static inline int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, static inline int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie,
int probe) int probe, const u8 *addr)
{ {
return 0; return 0;
} }

6
src/wps/wps_validate.c
View file

@ -1122,7 +1122,8 @@ int wps_validate_beacon(const struct wpabuf *wps_ie)
} }
int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe) int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe,
const u8 *addr)
{ {
struct wps_parse_attr attr; struct wps_parse_attr attr;
int wps2, sel_reg; int wps2, sel_reg;
@ -1166,7 +1167,8 @@ int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe)
wps_validate_authorized_macs(attr.authorized_macs, wps_validate_authorized_macs(attr.authorized_macs,
attr.authorized_macs_len, 0)) { attr.authorized_macs_len, 0)) {
wpa_printf(MSG_INFO, "WPS-STRICT: Invalid %sProbe Response " wpa_printf(MSG_INFO, "WPS-STRICT: Invalid %sProbe Response "
"frame", probe ? "" : "Beacon/"); "frame from " MACSTR, probe ? "" : "Beacon/",
MAC2STR(addr));
#ifdef WPS_STRICT_WPS2 #ifdef WPS_STRICT_WPS2
if (wps2) if (wps2)
return -1; return -1;

2
wpa_supplicant/wps_supplicant.c
View file

@ -1117,7 +1117,7 @@ int wpas_wps_ssid_wildcard_ok(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_WPS_STRICT #ifdef CONFIG_WPS_STRICT
if (wps_ie) { if (wps_ie) {
if (wps_validate_beacon_probe_resp(wps_ie, bss->beacon_ie_len > if (wps_validate_beacon_probe_resp(wps_ie, bss->beacon_ie_len >
0) < 0) 0, bss->bssid) < 0)
ret = 0; ret = 0;
if (bss->beacon_ie_len) { if (bss->beacon_ie_len) {
struct wpabuf *bcn_wps; struct wpabuf *bcn_wps;