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

WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN

Browse source 
The registrar variable is used only if this macro is defined, so no
need to set it otherwise.
This commit is contained in:
Andrii Bordunov 2011-10-22 22:21:53 +03:00 committed by Jouni Malinen
parent d5695081c2
commit 2c4f80d519
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/wps_supplicant.c
View file

@ -194,7 +194,9 @@ static int wpa_supplicant_wps_cred(void *ctx,
struct wpa_ssid *ssid = wpa_s->current_ssid; struct wpa_ssid *ssid = wpa_s->current_ssid;
u8 key_idx = 0; u8 key_idx = 0;
u16 auth_type; u16 auth_type;
#ifdef CONFIG_WPS_REG_DISABLE_OPEN
int registrar = 0; int registrar = 0;
#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
if ((wpa_s->conf->wps_cred_processing == 1 || if ((wpa_s->conf->wps_cred_processing == 1 ||
wpa_s->conf->wps_cred_processing == 2) && cred->cred_attr) { wpa_s->conf->wps_cred_processing == 2) && cred->cred_attr) {
@ -248,11 +250,13 @@ static int wpa_supplicant_wps_cred(void *ctx,
if (ssid && (ssid->key_mgmt & WPA_KEY_MGMT_WPS)) { if (ssid && (ssid->key_mgmt & WPA_KEY_MGMT_WPS)) {
wpa_printf(MSG_DEBUG, "WPS: Replace WPS network block based " wpa_printf(MSG_DEBUG, "WPS: Replace WPS network block based "
"on the received credential"); "on the received credential");
#ifdef CONFIG_WPS_REG_DISABLE_OPEN
if (ssid->eap.identity && if (ssid->eap.identity &&
ssid->eap.identity_len == WSC_ID_REGISTRAR_LEN && ssid->eap.identity_len == WSC_ID_REGISTRAR_LEN &&
os_memcmp(ssid->eap.identity, WSC_ID_REGISTRAR, os_memcmp(ssid->eap.identity, WSC_ID_REGISTRAR,
WSC_ID_REGISTRAR_LEN) == 0) WSC_ID_REGISTRAR_LEN) == 0)
registrar = 1; registrar = 1;
#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
os_free(ssid->eap.identity); os_free(ssid->eap.identity);
ssid->eap.identity = NULL; ssid->eap.identity = NULL;
ssid->eap.identity_len = 0; ssid->eap.identity_len = 0;