Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-19 10:33:05 -05:00
Code Issues Projects Releases Wiki Activity

SAE: Allow SAE-only network profile with sae_password to be written

Browse Source 
The commit a34ca59e (SAE: Allow SAE password to be configured separately
(STA)) added sae_password configuration option. We should also consider
sae_password in the wpa_config_write() function which stores the valid
network block details to an external database.

Fixes: a34ca59e4db0 ("SAE: Allow SAE password to be configured separately (STA)")
Signed-off-by: Sachin Shelke <sachin.shelke@nxp.com>
Signed-off-by: Cathy Luo <xiaohua.luo@nxp.com>
Signed-off-by: Ganapathi Bhat <ganapathi.bhat@nxp.com>
This commit is contained in:
Sachin Shelke 2020-03-02 05:18:41 +05:30 committed by Jouni Malinen
parent 5bad300565
commit 21f835e640
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/defs.h
View File

@ -82,6 +82,13 @@ static inline int wpa_key_mgmt_wpa_ieee8021x(int akm)
WPA_KEY_MGMT_FT_FILS_SHA384)); WPA_KEY_MGMT_FT_FILS_SHA384));
} }
static inline int wpa_key_mgmt_wpa_psk_no_sae(int akm)
{
return !!(akm & (WPA_KEY_MGMT_PSK |
WPA_KEY_MGMT_FT_PSK |
WPA_KEY_MGMT_PSK_SHA256));
}
static inline int wpa_key_mgmt_wpa_psk(int akm) static inline int wpa_key_mgmt_wpa_psk(int akm)
{ {
return !!(akm & (WPA_KEY_MGMT_PSK | return !!(akm & (WPA_KEY_MGMT_PSK |

7
wpa_supplicant/config_file.c
View File

@ -1642,8 +1642,11 @@ int wpa_config_write(const char *name, struct wpa_config *config)
for (ssid = config->ssid; ssid; ssid = ssid->next) { for (ssid = config->ssid; ssid; ssid = ssid->next) {
if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary) if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary)
continue; /* do not save temporary networks */ continue; /* do not save temporary networks */
if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set && if (wpa_key_mgmt_wpa_psk_no_sae(ssid->key_mgmt) &&
!ssid->passphrase) !ssid->psk_set && !ssid->passphrase)
continue; /* do not save invalid network */
if (wpa_key_mgmt_sae(ssid->key_mgmt) &&
!ssid->passphrase && !ssid->sae_password)
continue; /* do not save invalid network */ continue; /* do not save invalid network */
fprintf(f, "\nnetwork={\n"); fprintf(f, "\nnetwork={\n");
wpa_config_write_network(f, ssid); wpa_config_write_network(f, ssid);