Do not clear RSN parameters before full configuration

This fixes an issue where hostapd SET command is used to configure RSN
parameters and the wpa parameter is sent after the other parameters.
Previously, the default case here ended up clearing rsn_pairwise and
wpa_pairwise values and once wpa=2 was finally set, the cipher
configuration had already been lost.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-09-27 13:25:00 +03:00
parent be5ab8d4ab
commit 2976715217
1 changed files with 5 additions and 4 deletions

View File

@ -975,10 +975,11 @@ void hostapd_set_security_params(struct hostapd_bss_config *bss,
bss->rsn_pairwise = WPA_CIPHER_CCMP; bss->rsn_pairwise = WPA_CIPHER_CCMP;
} else { } else {
bss->ssid.security_policy = SECURITY_PLAINTEXT; bss->ssid.security_policy = SECURITY_PLAINTEXT;
if (full_config) {
bss->wpa_group = WPA_CIPHER_NONE; bss->wpa_group = WPA_CIPHER_NONE;
bss->wpa_pairwise = WPA_CIPHER_NONE; bss->wpa_pairwise = WPA_CIPHER_NONE;
bss->rsn_pairwise = WPA_CIPHER_NONE; bss->rsn_pairwise = WPA_CIPHER_NONE;
if (full_config)
bss->wpa_key_mgmt = WPA_KEY_MGMT_NONE; bss->wpa_key_mgmt = WPA_KEY_MGMT_NONE;
} }
} }
}