Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

eap-pwd: remove old EAP-PWD-Password support

Browse Source 
This password key was deprecated in favor of the common EAP-Password
key. Its been about a year so we are now removing support entirely
for EAP-PWD-Password.
This commit is contained in:
James Prestwood 2019-09-17 09:42:54 -07:00 committed by Denis Kenzior
parent 07e6876ef5
commit 235fd2b7e6
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/eap-pwd.c
View File

@ -726,7 +726,6 @@ static int eap_pwd_check_settings(struct l_settings *settings,
const struct eap_secret_info *secret; const struct eap_secret_info *secret;
char identity_key[72]; char identity_key[72];
char password_key[72]; char password_key[72];
char password_key_old[72];
L_AUTO_FREE_VAR(char *, identity); L_AUTO_FREE_VAR(char *, identity);
L_AUTO_FREE_VAR(char *, password) = NULL; L_AUTO_FREE_VAR(char *, password) = NULL;
@ -752,17 +751,6 @@ static int eap_pwd_check_settings(struct l_settings *settings,
password = l_settings_get_string(settings, "Security", password_key); password = l_settings_get_string(settings, "Security", password_key);
if (!password) { if (!password) {
snprintf(password_key_old, sizeof(password_key_old),
"%sPWD-Password", prefix);
password = l_settings_get_string(settings, "Security",
password_key_old);
if (password) {
explicit_bzero(password, strlen(password));
l_warn("Setting '%s' is deprecated, use '%s' instead",
password_key_old, password_key);
return 0;
}
secret = l_queue_find(secrets, eap_secret_info_match, secret = l_queue_find(secrets, eap_secret_info_match,
password_key); password_key);
if (secret) if (secret)
@ -801,19 +789,12 @@ static bool eap_pwd_load_settings(struct eap_state *eap,
pwd->password = l_settings_get_string(settings, "Security", pwd->password = l_settings_get_string(settings, "Security",
setting_key); setting_key);
if (!pwd->password) {
snprintf(setting_key, sizeof(setting_key), "%sPWD-Password",
prefix);
pwd->password = l_settings_get_string(settings, "Security",
setting_key);
if (!pwd->password) { if (!pwd->password) {
snprintf(setting_key, sizeof(setting_key), "%sPassword", snprintf(setting_key, sizeof(setting_key), "%sPassword",
prefix); prefix);
l_error("'%s' setting is missing", setting_key); l_error("'%s' setting is missing", setting_key);
goto error; goto error;
} }
}
eap_set_data(eap, pwd); eap_set_data(eap, pwd);