Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-09 00:12:36 +01:00
Code Releases Activity

eap-gtc: Standardize property keys

Browse Source 
Switch EAP-GTC to use the common password setting key nomenclature.
This commit is contained in:
Tim Kourt 2018-10-25 11:56:37 -07:00 committed by Denis Kenzior
parent 096caf2084
commit c92f8231b2
1 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/eap-gtc.c
View File

@ -32,7 +32,7 @@
#include "eap-private.h" #include "eap-private.h"
struct eap_gtc_state { struct eap_gtc_state {
char *secret; char *password;
}; };
static void eap_gtc_free(struct eap_state *eap) static void eap_gtc_free(struct eap_state *eap)
@ -41,7 +41,7 @@ static void eap_gtc_free(struct eap_state *eap)
eap_set_data(eap, NULL); eap_set_data(eap, NULL);
l_free(gtc->secret); l_free(gtc->password);
l_free(gtc); l_free(gtc);
} }
@ -49,7 +49,7 @@ static void eap_gtc_handle_request(struct eap_state *eap,
const uint8_t *pkt, size_t len) const uint8_t *pkt, size_t len)
{ {
struct eap_gtc_state *gtc = eap_get_data(eap); struct eap_gtc_state *gtc = eap_get_data(eap);
size_t secret_len = strlen(gtc->secret); size_t secret_len = strlen(gtc->password);
uint8_t response[5 + secret_len]; uint8_t response[5 + secret_len];
if (len < 8) if (len < 8)
@ -58,7 +58,7 @@ static void eap_gtc_handle_request(struct eap_state *eap,
if (strncmp((const char *)pkt, "Password", 8)) if (strncmp((const char *)pkt, "Password", 8))
goto error; goto error;
memcpy(response + 5, gtc->secret, secret_len); memcpy(response + 5, gtc->password, secret_len);
eap_send_response(eap, EAP_TYPE_GTC, response, 5 + secret_len); eap_send_response(eap, EAP_TYPE_GTC, response, 5 + secret_len);
@ -76,39 +76,50 @@ static int eap_gtc_check_settings(struct l_settings *settings,
const char *prefix, const char *prefix,
struct l_queue **out_missing) struct l_queue **out_missing)
{ {
char setting[64];
char setting2[64];
L_AUTO_FREE_VAR(char *, identity);
const struct eap_secret_info *secret; const struct eap_secret_info *secret;
char identity_key[72];
char password_key[72];
char password_key_old[72];
snprintf(setting, sizeof(setting), "%sIdentity", prefix); L_AUTO_FREE_VAR(char *, identity);
identity = l_settings_get_string(settings, "Security", setting); L_AUTO_FREE_VAR(char *, password) = NULL;
snprintf(setting2, sizeof(setting2), "%sGTC-Secret", prefix); snprintf(identity_key, sizeof(identity_key), "%sIdentity", prefix);
snprintf(password_key, sizeof(password_key), "%sPassword", prefix);
identity = l_settings_get_string(settings, "Security", identity_key);
/* no identity setting found */
if (!identity) { if (!identity) {
secret = l_queue_find(secrets, eap_secret_info_match, setting); secret = l_queue_find(secrets, eap_secret_info_match,
identity_key);
if (secret)
return 0;
/* no secret found either */ eap_append_secret(out_missing, EAP_SECRET_REMOTE_USER_PASSWORD,
if (!secret) identity_key, password_key, NULL,
eap_append_secret(out_missing, EAP_CACHE_TEMPORARY);
EAP_SECRET_REMOTE_USER_PASSWORD,
setting, setting2, NULL,
EAP_CACHE_NEVER);
return 0; return 0;
} }
/* identity found, but secret missing */ password = l_settings_get_string(settings, "Security", password_key);
if (!l_settings_get_value(settings, "Security", setting2)) {
secret = l_queue_find(secrets, eap_secret_info_match, setting2);
if (!secret) if (!password) {
eap_append_secret(out_missing, snprintf(password_key_old, sizeof(password_key_old),
EAP_SECRET_REMOTE_PASSWORD, "%sGTC-Secret", prefix);
setting2, NULL, identity, password = l_settings_get_string(settings, "Security",
EAP_CACHE_NEVER); password_key_old);
if (password)
return 0;
secret = l_queue_find(secrets, eap_secret_info_match,
password_key);
if (secret)
return 0;
eap_append_secret(out_missing, EAP_SECRET_REMOTE_PASSWORD,
password_key, NULL, identity,
EAP_CACHE_TEMPORARY);
} }
return 0; return 0;
@ -119,14 +130,27 @@ static bool eap_gtc_load_settings(struct eap_state *eap,
const char *prefix) const char *prefix)
{ {
struct eap_gtc_state *gtc; struct eap_gtc_state *gtc;
char setting[64]; char password_key[72];
char *secret; char *password;
snprintf(setting, sizeof(setting), "%sGTC-Secret", prefix); snprintf(password_key, sizeof(password_key), "%sPassword", prefix);
secret = l_settings_get_string(settings, "Security", setting); password = l_settings_get_string(settings, "Security", password_key);
if (!password) {
snprintf(password_key, sizeof(password_key), "%sGTC-Secret",
prefix);
password = l_settings_get_string(settings, "Security",
password_key);
if (!password) {
l_error("Property '%sPassword' is missing.", prefix);
return false;
}
}
gtc = l_new(struct eap_gtc_state, 1); gtc = l_new(struct eap_gtc_state, 1);
gtc->secret = secret; gtc->password = password;
eap_set_data(eap, gtc); eap_set_data(eap, gtc);
return true; return true;