From: Jouni Malinen Date: Thu, 24 Nov 2011 20:30:15 +0000 (+0200) Subject: Do not save an invalid network block in wpa_supplicant.conf X-Git-Tag: aosp-jb-start~270 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e8280bd5e6d2a7144b468a47f8c5b8bd4791400;p=thirdparty%2Fhostap.git Do not save an invalid network block in wpa_supplicant.conf wpa_supplicant is going to reject a configuration file that uses WPA/WPA2-Personal (the default key_mgmt), but does not define passphrase/PSK. Refuse to save such a configuration to avoid getting stuck with a configuration that wpa_supplicant will reject. Signed-hostap: Jouni Malinen --- diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index d87bd0d4b..33d0d4ddf 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -753,6 +753,9 @@ int wpa_config_write(const char *name, struct wpa_config *config) for (ssid = config->ssid; ssid; ssid = ssid->next) { if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary) continue; /* do not save temporary networks */ + if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set && + !ssid->passphrase) + continue; /* do not save invalid network */ fprintf(f, "\nnetwork={\n"); wpa_config_write_network(f, ssid); fprintf(f, "}\n");