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

WPS: Do not allow Label and Display config methods to be enabled

Browse source 
It is unclear which PIN is used if both Label and Display config
methods are advertised. Avoid this by not allowing such configuration.
This commit is contained in:
Jouni Malinen 2010-07-17 20:30:49 -07:00 committed by Jouni Malinen
parent 4436274bef
commit 979b988ed6
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wpa_supplicant/wps_supplicant.c
View file

@ -861,6 +861,13 @@ int wpas_wps_init(struct wpa_supplicant *wpa_s)
wps->dev.serial_number = wpa_s->conf->serial_number; wps->dev.serial_number = wpa_s->conf->serial_number;
wps->config_methods = wps->config_methods =
wps_config_methods_str2bin(wpa_s->conf->config_methods); wps_config_methods_str2bin(wpa_s->conf->config_methods);
if ((wps->config_methods & (WPS_CONFIG_DISPLAY | WPS_CONFIG_LABEL)) ==
(WPS_CONFIG_DISPLAY | WPS_CONFIG_LABEL)) {
wpa_printf(MSG_ERROR, "WPS: Both Label and Display config "
"methods are not allowed at the same time");
os_free(wps);
return -1;
}
if (wpa_s->conf->device_type && if (wpa_s->conf->device_type &&
wps_dev_type_str2bin(wpa_s->conf->device_type, wps_dev_type_str2bin(wpa_s->conf->device_type,
wps->dev.pri_dev_type) < 0) { wps->dev.pri_dev_type) < 0) {