mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-22 23:09:34 +01:00
eap-mschapv2: Load credentials obtained from agent
If needed load the username and password obtained from the agent and received in the settings object.
This commit is contained in:
parent
cb775819b8
commit
6dc5d2c3ec
@ -724,18 +724,34 @@ static bool eap_mschapv2_load_settings(struct eap_state *eap,
|
||||
const char *prefix)
|
||||
{
|
||||
struct eap_mschapv2_state *state;
|
||||
const char *password;
|
||||
const char *identity, *password = NULL;
|
||||
char setting[64];
|
||||
|
||||
state = l_new(struct eap_mschapv2_state, 1);
|
||||
|
||||
snprintf(setting, sizeof(setting), "%sIdentity", prefix);
|
||||
set_user_name(state,
|
||||
l_settings_get_value(settings, "Security", setting));
|
||||
identity = l_settings_get_value(settings, "Security", setting);
|
||||
|
||||
if (!identity) {
|
||||
snprintf(setting, sizeof(setting), "%sIdentity-User", prefix);
|
||||
identity = l_settings_get_value(settings, "Security", setting);
|
||||
if (!identity)
|
||||
goto error;
|
||||
|
||||
snprintf(setting, sizeof(setting), "%sIdentity-Password",
|
||||
prefix);
|
||||
password = l_settings_get_value(settings, "Security", setting);
|
||||
if (!password)
|
||||
goto error;
|
||||
|
||||
set_password_from_string(state, password);
|
||||
}
|
||||
|
||||
set_user_name(state, identity);
|
||||
state->user_len = strlen(state->user);
|
||||
|
||||
/* Either read the password-hash from hexdump or password and hash it */
|
||||
if (!password) {
|
||||
snprintf(setting, sizeof(setting), "%sPassword-Hash", prefix);
|
||||
password = l_settings_get_value(settings, "Security", setting);
|
||||
if (password) {
|
||||
@ -745,16 +761,25 @@ static bool eap_mschapv2_load_settings(struct eap_state *eap,
|
||||
tmp = l_util_from_hexstring(password, &len);
|
||||
memcpy(state->password_hash, tmp, 16);
|
||||
l_free(tmp);
|
||||
} else {
|
||||
}
|
||||
}
|
||||
|
||||
if (!password) {
|
||||
snprintf(setting, sizeof(setting), "%sPassword", prefix);
|
||||
password = l_settings_get_value(settings, "Security",
|
||||
setting);
|
||||
password = l_settings_get_value(settings, "Security", setting);
|
||||
if (!password)
|
||||
goto error;
|
||||
|
||||
set_password_from_string(state, password);
|
||||
}
|
||||
|
||||
eap_set_data(eap, state);
|
||||
|
||||
return true;
|
||||
|
||||
error:
|
||||
free(state);
|
||||
return false;
|
||||
}
|
||||
|
||||
static struct eap_method eap_mschapv2 = {
|
||||
|
Loading…
Reference in New Issue
Block a user