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

WPS 2.0: Add strict validation of SetSelectedRegistrar attributes

Browse source
This commit is contained in:
Jouni Malinen 2010-07-18 18:54:58 -07:00 committed by Jouni Malinen
parent 545ee4fd3d
commit 168f840169
3 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/wps/wps.h
View file

@ -774,6 +774,7 @@ int wps_validate_m8_encr(const struct wpabuf *tlvs, int ap);
int wps_validate_wsc_ack(const struct wpabuf *tlvs); int wps_validate_wsc_ack(const struct wpabuf *tlvs);
int wps_validate_wsc_nack(const struct wpabuf *tlvs); int wps_validate_wsc_nack(const struct wpabuf *tlvs);
int wps_validate_wsc_done(const struct wpabuf *tlvs); int wps_validate_wsc_done(const struct wpabuf *tlvs);
int wps_validate_upnp_set_selected_registrar(const struct wpabuf *tlvs);
#else /* CONFIG_WPS_STRICT */ #else /* CONFIG_WPS_STRICT */
static inline int wps_validate_beacon(const struct wpabuf *wps_ie){ static inline int wps_validate_beacon(const struct wpabuf *wps_ie){
return 0; return 0;
@ -884,6 +885,12 @@ static inline int wps_validate_wsc_done(const struct wpabuf *tlvs)
{ {
return 0; return 0;
} }
static inline int wps_validate_upnp_set_selected_registrar(
const struct wpabuf *tlvs)
{
return 0;
}
#endif /* CONFIG_WPS_STRICT */ #endif /* CONFIG_WPS_STRICT */
#endif /* WPS_H */ #endif /* WPS_H */

2
src/wps/wps_upnp_ap.c
View file

@ -39,6 +39,8 @@ int upnp_er_set_selected_registrar(struct wps_registrar *reg,
wpa_hexdump_buf(MSG_MSGDUMP, "WPS: SetSelectedRegistrar attributes", wpa_hexdump_buf(MSG_MSGDUMP, "WPS: SetSelectedRegistrar attributes",
msg); msg);
if (wps_validate_upnp_set_selected_registrar(msg) < 0)
return -1;
if (wps_parse_msg(msg, &attr) < 0) if (wps_parse_msg(msg, &attr) < 0)
return -1; return -1;

37
src/wps/wps_validate.c
View file

@ -1850,3 +1850,40 @@ int wps_validate_wsc_done(const struct wpabuf *tlvs)
return 0; return 0;
} }
int wps_validate_upnp_set_selected_registrar(const struct wpabuf *tlvs)
{
struct wps_parse_attr attr;
int wps2;
int sel_reg;
if (tlvs == NULL) {
wpa_printf(MSG_INFO, "WPS-STRICT: No TLVs in "
"SetSelectedRegistrar");
return -1;
}
if (wps_parse_msg(tlvs, &attr) < 0) {
wpa_printf(MSG_INFO, "WPS-STRICT: Failed to parse attributes "
"in SetSelectedRegistrar");
return -1;
}
wps2 = attr.version2 != NULL;
sel_reg = attr.selected_registrar != NULL &&
*attr.selected_registrar != 0;
if (wps_validate_version(attr.version, 1) ||
wps_validate_dev_password_id(attr.dev_password_id, sel_reg) ||
wps_validate_sel_reg_config_methods(attr.sel_reg_config_methods,
wps2, sel_reg) ||
wps_validate_version2(attr.version2, wps2) ||
wps_validate_authorized_macs(attr.authorized_macs,
attr.authorized_macs_len, wps2) ||
wps_validate_uuid_r(attr.uuid_r, wps2)) {
wpa_printf(MSG_INFO, "WPS-STRICT: Invalid "
"SetSelectedRegistrar");
return -1;
}
return 0;
}