eap-wsc: Registrar mode settings loading
Alongside the current EAP-WSC enrollee side support, add the initial part of registrar side. In the same file, register a new method with the name string of "WSC-R". In this patch only the load_settings method is added. validate_identity and handle_response are added in later patches.
This commit is contained in:
Andrew Zaborowski
Denis Kenzior
parent
4c64e0d560
commit
50f2b3d0ca
460
src/eap-wsc.c
460
src/eap-wsc.c
|
|
@ -57,28 +57,40 @@ enum wsc_flag {
|
|||
};
|
||||
|
||||
enum state {
|
||||
/* Enrollee states */
|
||||
STATE_EXPECT_START = 0,
|
||||
STATE_EXPECT_M2,
|
||||
STATE_EXPECT_M4,
|
||||
STATE_EXPECT_M6,
|
||||
STATE_EXPECT_M8,
|
||||
STATE_FINISHED,
|
||||
/* Registrar states */
|
||||
STATE_EXPECT_IDENTITY,
|
||||
STATE_EXPECT_M1,
|
||||
STATE_EXPECT_M3,
|
||||
STATE_EXPECT_M5,
|
||||
STATE_EXPECT_M7,
|
||||
STATE_EXPECT_DONE,
|
||||
};
|
||||
|
||||
static struct l_key *dh5_generator;
|
||||
static struct l_key *dh5_prime;
|
||||
|
||||
struct eap_wsc_state {
|
||||
bool registrar;
|
||||
struct wsc_m1 *m1;
|
||||
struct wsc_m2 *m2;
|
||||
struct wsc_credential wpa2_cred;
|
||||
struct wsc_credential open_cred;
|
||||
uint8_t *sent_pdu;
|
||||
size_t sent_len;
|
||||
struct l_key *private;
|
||||
char *device_password;
|
||||
uint8_t e_snonce1[16];
|
||||
uint8_t e_snonce2[16];
|
||||
uint8_t local_snonce1[16];
|
||||
uint8_t local_snonce2[16];
|
||||
uint8_t iv1[16];
|
||||
uint8_t iv2[16];
|
||||
uint8_t iv3[16];
|
||||
uint8_t psk1[16];
|
||||
uint8_t psk2[16];
|
||||
uint8_t r_hash2[32];
|
||||
|
|
@ -274,12 +286,8 @@ static bool encrypted_settings_encrypt(struct eap_wsc_state *wsc,
|
|||
return true;
|
||||
}
|
||||
|
||||
static void eap_wsc_free(struct eap_state *eap)
|
||||
static void eap_wsc_state_free(struct eap_wsc_state *wsc)
|
||||
{
|
||||
struct eap_wsc_state *wsc = eap_get_data(eap);
|
||||
|
||||
eap_set_data(eap, NULL);
|
||||
|
||||
if (wsc->device_password) {
|
||||
explicit_bzero(wsc->device_password,
|
||||
strlen(wsc->device_password));
|
||||
|
|
@ -305,14 +313,24 @@ static void eap_wsc_free(struct eap_state *eap)
|
|||
l_free(wsc->m1);
|
||||
l_free(wsc->m2);
|
||||
|
||||
explicit_bzero(wsc->e_snonce1, 16);
|
||||
explicit_bzero(wsc->e_snonce2, 16);
|
||||
explicit_bzero(wsc->local_snonce1, 16);
|
||||
explicit_bzero(wsc->local_snonce2, 16);
|
||||
explicit_bzero(wsc->psk1, 16);
|
||||
explicit_bzero(wsc->psk2, 16);
|
||||
explicit_bzero(&wsc->wpa2_cred, sizeof(struct wsc_credential));
|
||||
explicit_bzero(&wsc->open_cred, sizeof(struct wsc_credential));
|
||||
|
||||
l_free(wsc);
|
||||
}
|
||||
|
||||
static void eap_wsc_free(struct eap_state *eap)
|
||||
{
|
||||
struct eap_wsc_state *wsc = eap_get_data(eap);
|
||||
|
||||
eap_set_data(eap, NULL);
|
||||
eap_wsc_state_free(wsc);
|
||||
}
|
||||
|
||||
static void eap_wsc_send_fragment(struct eap_state *eap)
|
||||
{
|
||||
struct eap_wsc_state *wsc = eap_get_data(eap);
|
||||
|
|
@ -541,9 +559,9 @@ static void eap_wsc_send_m7(struct eap_state *eap,
|
|||
size_t encrypted_len;
|
||||
bool r;
|
||||
|
||||
memcpy(m7es.e_snonce2, wsc->e_snonce2, sizeof(wsc->e_snonce2));
|
||||
memcpy(m7es.e_snonce2, wsc->local_snonce2, sizeof(wsc->local_snonce2));
|
||||
pdu = wsc_build_m7_encrypted_settings(&m7es, &pdu_len);
|
||||
explicit_bzero(m7es.e_snonce2, sizeof(wsc->e_snonce2));
|
||||
explicit_bzero(m7es.e_snonce2, sizeof(wsc->local_snonce2));
|
||||
if (!pdu)
|
||||
return;
|
||||
|
||||
|
|
@ -642,9 +660,9 @@ static void eap_wsc_send_m5(struct eap_state *eap,
|
|||
size_t encrypted_len;
|
||||
bool r;
|
||||
|
||||
memcpy(m5es.e_snonce1, wsc->e_snonce1, sizeof(wsc->e_snonce1));
|
||||
memcpy(m5es.e_snonce1, wsc->local_snonce1, sizeof(wsc->local_snonce1));
|
||||
pdu = wsc_build_m5_encrypted_settings(&m5es, &pdu_len);
|
||||
explicit_bzero(m5es.e_snonce1, sizeof(wsc->e_snonce1));
|
||||
explicit_bzero(m5es.e_snonce1, sizeof(wsc->local_snonce1));
|
||||
if (!pdu)
|
||||
return;
|
||||
|
||||
|
|
@ -773,8 +791,8 @@ static void eap_wsc_send_m3(struct eap_state *eap,
|
|||
* E-Hash1 = HMACAuthKey(E-S1 || PSK1 || PKE || PKR)
|
||||
* E-Hash2 = HMACAuthKey(E-S2 || PSK2 || PKE || PKR)
|
||||
*/
|
||||
iov[0].iov_base = wsc->e_snonce1;
|
||||
iov[0].iov_len = sizeof(wsc->e_snonce1);
|
||||
iov[0].iov_base = wsc->local_snonce1;
|
||||
iov[0].iov_len = sizeof(wsc->local_snonce1);
|
||||
iov[1].iov_base = wsc->psk1;
|
||||
iov[1].iov_len = sizeof(wsc->psk1);
|
||||
iov[2].iov_base = wsc->m1->public_key;
|
||||
|
|
@ -785,8 +803,8 @@ static void eap_wsc_send_m3(struct eap_state *eap,
|
|||
l_checksum_get_digest(wsc->hmac_auth_key,
|
||||
m3.e_hash1, sizeof(m3.e_hash1));
|
||||
|
||||
iov[0].iov_base = wsc->e_snonce2;
|
||||
iov[0].iov_len = sizeof(wsc->e_snonce2);
|
||||
iov[0].iov_base = wsc->local_snonce2;
|
||||
iov[0].iov_len = sizeof(wsc->local_snonce2);
|
||||
iov[1].iov_base = wsc->psk2;
|
||||
iov[1].iov_len = sizeof(wsc->psk2);
|
||||
l_checksum_updatev(wsc->hmac_auth_key, iov, 4);
|
||||
|
|
@ -1211,9 +1229,70 @@ static bool load_constrained_string(struct l_settings *settings,
|
|||
return true;
|
||||
}
|
||||
|
||||
static bool eap_wsc_load_settings(struct eap_state *eap,
|
||||
struct l_settings *settings,
|
||||
const char *prefix)
|
||||
static bool load_device_data(struct l_settings *settings,
|
||||
char *manufacturer,
|
||||
char *model_name,
|
||||
char *model_number,
|
||||
char *serial_number,
|
||||
struct wsc_primary_device_type *dev_type,
|
||||
char *device_name,
|
||||
uint8_t *rf_bands,
|
||||
uint32_t *os_version)
|
||||
{
|
||||
struct wsc_m1 *m1;
|
||||
unsigned int u32;
|
||||
|
||||
if (!load_constrained_string(settings, "Manufacturer",
|
||||
manufacturer, sizeof(m1->manufacturer)))
|
||||
strcpy(manufacturer, " ");
|
||||
|
||||
if (!load_constrained_string(settings, "ModelName",
|
||||
model_name, sizeof(m1->model_name)))
|
||||
strcpy(model_name, " ");
|
||||
|
||||
if (!load_constrained_string(settings, "ModelNumber",
|
||||
model_number, sizeof(m1->model_number)))
|
||||
strcpy(model_number, " ");
|
||||
|
||||
if (!load_constrained_string(settings, "SerialNumber",
|
||||
serial_number, sizeof(m1->serial_number)))
|
||||
strcpy(serial_number, " ");
|
||||
|
||||
if (!load_primary_device_type(settings, dev_type)) {
|
||||
/* Make ourselves a WFA standard PC by default */
|
||||
dev_type->category = 1;
|
||||
memcpy(dev_type->oui, wsc_wfa_oui, 3);
|
||||
dev_type->oui_type = 0x04;
|
||||
dev_type->subcategory = 1;
|
||||
}
|
||||
|
||||
if (!load_constrained_string(settings, "DeviceName",
|
||||
device_name, sizeof(m1->device_name)))
|
||||
strcpy(device_name, " ");
|
||||
|
||||
if (!l_settings_get_uint(settings, "WSC", "RFBand", &u32))
|
||||
return false;
|
||||
|
||||
switch (u32) {
|
||||
case WSC_RF_BAND_2_4_GHZ:
|
||||
case WSC_RF_BAND_5_0_GHZ:
|
||||
case WSC_RF_BAND_60_GHZ:
|
||||
*rf_bands = u32;
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!l_settings_get_uint(settings, "WSC", "OSVersion", &u32))
|
||||
u32 = 0;
|
||||
|
||||
*os_version = u32 & 0x7fffffff;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static struct eap_wsc_state *eap_wsc_new_common(struct l_settings *settings,
|
||||
bool registrar)
|
||||
{
|
||||
struct eap_wsc_state *wsc;
|
||||
const char *v;
|
||||
|
|
@ -1222,9 +1301,12 @@ static bool eap_wsc_load_settings(struct eap_state *eap,
|
|||
unsigned int u32;
|
||||
|
||||
wsc = l_new(struct eap_wsc_state, 1);
|
||||
wsc->registrar = registrar;
|
||||
|
||||
wsc->m1 = l_new(struct wsc_m1, 1);
|
||||
wsc->m1->version2 = true;
|
||||
|
||||
if (registrar)
|
||||
wsc->m2 = l_new(struct wsc_m2, 1);
|
||||
|
||||
v = l_settings_get_value(settings, "WSC", "EnrolleeMAC");
|
||||
if (!v)
|
||||
|
|
@ -1236,104 +1318,21 @@ static bool eap_wsc_load_settings(struct eap_state *eap,
|
|||
if (!wsc_uuid_from_addr(wsc->m1->addr, wsc->m1->uuid_e))
|
||||
goto err;
|
||||
|
||||
if (!load_hexencoded(settings, "EnrolleeNonce",
|
||||
wsc->m1->enrollee_nonce, 16))
|
||||
l_getrandom(wsc->m1->enrollee_nonce, 16);
|
||||
|
||||
if (load_hexencoded(settings, "PrivateKey", private_key, 192)) {
|
||||
if (!l_key_validate_dh_payload(private_key, 192,
|
||||
crypto_dh5_prime,
|
||||
crypto_dh5_prime_size)) {
|
||||
explicit_bzero(private_key, 192);
|
||||
goto err;
|
||||
}
|
||||
|
||||
wsc->private = l_key_new(L_KEY_RAW, private_key, 192);
|
||||
explicit_bzero(private_key, 192);
|
||||
} else
|
||||
wsc->private = l_key_generate_dh_private(crypto_dh5_prime,
|
||||
crypto_dh5_prime_size);
|
||||
|
||||
if (!wsc->private)
|
||||
goto err;
|
||||
|
||||
len = sizeof(wsc->m1->public_key);
|
||||
if (!l_key_compute_dh_public(dh5_generator, wsc->private, dh5_prime,
|
||||
wsc->m1->public_key, &len))
|
||||
goto err;
|
||||
|
||||
if (len != sizeof(wsc->m1->public_key))
|
||||
goto err;
|
||||
|
||||
wsc->m1->auth_type_flags = WSC_AUTHENTICATION_TYPE_WPA2_PERSONAL |
|
||||
WSC_AUTHENTICATION_TYPE_WPA_PERSONAL |
|
||||
WSC_AUTHENTICATION_TYPE_OPEN;
|
||||
wsc->m1->encryption_type_flags = WSC_ENCRYPTION_TYPE_NONE |
|
||||
WSC_ENCRYPTION_TYPE_AES_TKIP;
|
||||
wsc->m1->connection_type_flags = WSC_CONNECTION_TYPE_ESS;
|
||||
|
||||
if (!l_settings_get_uint(settings, "WSC",
|
||||
"ConfigurationMethods", &u32))
|
||||
if (!l_settings_get_uint(settings, "WSC", "ConfigurationMethods", &u32))
|
||||
u32 = WSC_CONFIGURATION_METHOD_VIRTUAL_DISPLAY_PIN;
|
||||
|
||||
wsc->m1->config_methods = u32;
|
||||
wsc->m1->state = WSC_STATE_NOT_CONFIGURED;
|
||||
|
||||
if (!load_constrained_string(settings, "Manufacturer",
|
||||
wsc->m1->manufacturer, sizeof(wsc->m1->manufacturer)))
|
||||
strcpy(wsc->m1->manufacturer, " ");
|
||||
|
||||
if (!load_constrained_string(settings, "ModelName",
|
||||
wsc->m1->model_name, sizeof(wsc->m1->model_name)))
|
||||
strcpy(wsc->m1->model_name, " ");
|
||||
|
||||
if (!load_constrained_string(settings, "ModelNumber",
|
||||
wsc->m1->model_number, sizeof(wsc->m1->model_number)))
|
||||
strcpy(wsc->m1->model_number, " ");
|
||||
|
||||
if (!load_constrained_string(settings, "SerialNumber",
|
||||
wsc->m1->serial_number, sizeof(wsc->m1->serial_number)))
|
||||
strcpy(wsc->m1->serial_number, " ");
|
||||
|
||||
if (!load_primary_device_type(settings,
|
||||
&wsc->m1->primary_device_type)) {
|
||||
/* Make ourselves a WFA standard PC by default */
|
||||
wsc->m1->primary_device_type.category = 1;
|
||||
memcpy(wsc->m1->primary_device_type.oui, wsc_wfa_oui, 3);
|
||||
wsc->m1->primary_device_type.oui_type = 0x04;
|
||||
wsc->m1->primary_device_type.subcategory = 1;
|
||||
}
|
||||
|
||||
if (!load_constrained_string(settings, "DeviceName",
|
||||
wsc->m1->device_name, sizeof(wsc->m1->device_name)))
|
||||
strcpy(wsc->m1->device_name, " ");
|
||||
|
||||
if (!l_settings_get_uint(settings, "WSC", "RFBand", &u32))
|
||||
goto err;
|
||||
|
||||
switch (u32) {
|
||||
case WSC_RF_BAND_2_4_GHZ:
|
||||
case WSC_RF_BAND_5_0_GHZ:
|
||||
case WSC_RF_BAND_60_GHZ:
|
||||
wsc->m1->rf_bands = u32;
|
||||
break;
|
||||
default:
|
||||
goto err;
|
||||
}
|
||||
|
||||
wsc->m1->association_state = WSC_ASSOCIATION_STATE_NOT_ASSOCIATED;
|
||||
wsc->m1->configuration_error = WSC_CONFIGURATION_ERROR_NO_ERROR;
|
||||
|
||||
if (!l_settings_get_uint(settings, "WSC",
|
||||
"OSVersion", &u32))
|
||||
u32 = 0;
|
||||
|
||||
wsc->m1->os_version = u32 & 0x7fffffff;
|
||||
if (!registrar)
|
||||
wsc->m1->config_methods = u32;
|
||||
else
|
||||
wsc->m2->config_methods = u32;
|
||||
|
||||
if (!l_settings_get_uint(settings, "WSC", "DevicePasswordId", &u32))
|
||||
u32 = WSC_DEVICE_PASSWORD_ID_PUSH_BUTTON;
|
||||
|
||||
wsc->m1->device_password_id = u32;
|
||||
if (!registrar)
|
||||
wsc->m1->device_password_id = u32;
|
||||
else
|
||||
wsc->m2->device_password_id = u32;
|
||||
|
||||
wsc->device_password = l_settings_get_string(settings, "WSC",
|
||||
"DevicePassword");
|
||||
|
|
@ -1361,11 +1360,43 @@ static bool eap_wsc_load_settings(struct eap_state *eap,
|
|||
} else
|
||||
wsc->device_password = l_strdup("00000000");
|
||||
|
||||
if (!load_hexencoded(settings, "E-SNonce1", wsc->e_snonce1, 16))
|
||||
l_getrandom(wsc->e_snonce1, 16);
|
||||
/*
|
||||
* The settings we read below probably shouldn't be used except to
|
||||
* eliminate randomness in debugging/tests.
|
||||
*/
|
||||
if (load_hexencoded(settings, "PrivateKey", private_key, 192)) {
|
||||
if (!l_key_validate_dh_payload(private_key, 192,
|
||||
crypto_dh5_prime,
|
||||
crypto_dh5_prime_size)) {
|
||||
explicit_bzero(private_key, 192);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (!load_hexencoded(settings, "E-SNonce2", wsc->e_snonce2, 16))
|
||||
l_getrandom(wsc->e_snonce2, 16);
|
||||
wsc->private = l_key_new(L_KEY_RAW, private_key, 192);
|
||||
explicit_bzero(private_key, 192);
|
||||
} else
|
||||
wsc->private = l_key_generate_dh_private(crypto_dh5_prime,
|
||||
crypto_dh5_prime_size);
|
||||
|
||||
if (!wsc->private)
|
||||
goto err;
|
||||
|
||||
len = sizeof(wsc->m1->public_key);
|
||||
if (!l_key_compute_dh_public(dh5_generator, wsc->private, dh5_prime,
|
||||
registrar ? wsc->m2->public_key :
|
||||
wsc->m1->public_key, &len))
|
||||
goto err;
|
||||
|
||||
if (len != sizeof(wsc->m1->public_key))
|
||||
goto err;
|
||||
|
||||
if (!load_hexencoded(settings, registrar ? "R-SNonce1" : "E-SNonce1",
|
||||
wsc->local_snonce1, 16))
|
||||
l_getrandom(wsc->local_snonce1, 16);
|
||||
|
||||
if (!load_hexencoded(settings, registrar ? "R-SNonce2" : "E-SNonce2",
|
||||
wsc->local_snonce2, 16))
|
||||
l_getrandom(wsc->local_snonce2, 16);
|
||||
|
||||
if (!load_hexencoded(settings, "IV1", wsc->iv1, 16))
|
||||
l_getrandom(wsc->iv1, 16);
|
||||
|
|
@ -1373,23 +1404,57 @@ static bool eap_wsc_load_settings(struct eap_state *eap,
|
|||
if (!load_hexencoded(settings, "IV2", wsc->iv2, 16))
|
||||
l_getrandom(wsc->iv2, 16);
|
||||
|
||||
return wsc;
|
||||
|
||||
err:
|
||||
eap_wsc_state_free(wsc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static bool eap_wsc_load_settings(struct eap_state *eap,
|
||||
struct l_settings *settings,
|
||||
const char *prefix)
|
||||
{
|
||||
struct eap_wsc_state *wsc = eap_wsc_new_common(settings, false);
|
||||
|
||||
if (!wsc)
|
||||
return false;
|
||||
|
||||
wsc->m1->version2 = true;
|
||||
wsc->m1->state = WSC_STATE_NOT_CONFIGURED;
|
||||
wsc->m1->association_state = WSC_ASSOCIATION_STATE_NOT_ASSOCIATED;
|
||||
wsc->m1->configuration_error = WSC_CONFIGURATION_ERROR_NO_ERROR;
|
||||
|
||||
wsc->m1->auth_type_flags = WSC_AUTHENTICATION_TYPE_WPA2_PERSONAL |
|
||||
WSC_AUTHENTICATION_TYPE_WPA_PERSONAL |
|
||||
WSC_AUTHENTICATION_TYPE_OPEN;
|
||||
wsc->m1->encryption_type_flags = WSC_ENCRYPTION_TYPE_NONE |
|
||||
WSC_ENCRYPTION_TYPE_AES_TKIP;
|
||||
wsc->m1->connection_type_flags = WSC_CONNECTION_TYPE_ESS;
|
||||
|
||||
if (!load_device_data(settings,
|
||||
wsc->m1->manufacturer,
|
||||
wsc->m1->model_name,
|
||||
wsc->m1->model_number,
|
||||
wsc->m1->serial_number,
|
||||
&wsc->m1->primary_device_type,
|
||||
wsc->m1->device_name,
|
||||
&wsc->m1->rf_bands,
|
||||
&wsc->m1->os_version))
|
||||
goto err;
|
||||
|
||||
/* Debug settings */
|
||||
if (!load_hexencoded(settings, "EnrolleeNonce",
|
||||
wsc->m1->enrollee_nonce, 16))
|
||||
l_getrandom(wsc->m1->enrollee_nonce, 16);
|
||||
|
||||
wsc->state = STATE_EXPECT_START;
|
||||
eap_set_data(eap, wsc);
|
||||
|
||||
return true;
|
||||
|
||||
err:
|
||||
if (wsc->device_password) {
|
||||
explicit_bzero(wsc->device_password,
|
||||
strlen(wsc->device_password));
|
||||
l_free(wsc->device_password);
|
||||
}
|
||||
|
||||
if (wsc->private)
|
||||
l_key_free(wsc->private);
|
||||
|
||||
l_free(wsc->m1);
|
||||
l_free(wsc);
|
||||
|
||||
eap_wsc_state_free(wsc);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1405,6 +1470,134 @@ static struct eap_method eap_wsc = {
|
|||
.load_settings = eap_wsc_load_settings,
|
||||
};
|
||||
|
||||
static bool eap_wsc_r_load_settings(struct eap_state *eap,
|
||||
struct l_settings *settings,
|
||||
const char *prefix)
|
||||
{
|
||||
/*
|
||||
* On the Registrar we store some information in wsc->m1 for the
|
||||
* actual M1's validation, and we fill in the elements of M2
|
||||
* that don't depend on the data received in M1.
|
||||
*/
|
||||
struct eap_wsc_state *wsc = eap_wsc_new_common(settings, true);
|
||||
char *str;
|
||||
|
||||
if (!wsc)
|
||||
return false;
|
||||
|
||||
if (!load_hexencoded(settings, "UUID-R", wsc->m2->uuid_r, 16))
|
||||
goto err;
|
||||
|
||||
if (!load_device_data(settings,
|
||||
wsc->m2->manufacturer,
|
||||
wsc->m2->model_name,
|
||||
wsc->m2->model_number,
|
||||
wsc->m2->serial_number,
|
||||
&wsc->m2->primary_device_type,
|
||||
wsc->m2->device_name,
|
||||
&wsc->m2->rf_bands,
|
||||
&wsc->m2->os_version))
|
||||
goto err;
|
||||
|
||||
wsc->m2->auth_type_flags = 0;
|
||||
|
||||
str = l_settings_get_string(settings, "WSC", "WPA2-SSID");
|
||||
if (str) {
|
||||
if (strlen(str) > 32)
|
||||
goto err;
|
||||
|
||||
wsc->m2->auth_type_flags |=
|
||||
WSC_AUTHENTICATION_TYPE_WPA2_PERSONAL;
|
||||
wsc->m2->encryption_type_flags |= WSC_ENCRYPTION_TYPE_AES_TKIP;
|
||||
wsc->wpa2_cred.auth_type =
|
||||
WSC_AUTHENTICATION_TYPE_WPA2_PERSONAL;
|
||||
wsc->wpa2_cred.encryption_type = WSC_ENCRYPTION_TYPE_AES_TKIP;
|
||||
|
||||
wsc->wpa2_cred.ssid_len = strlen(str);
|
||||
memcpy(wsc->wpa2_cred.ssid, str, wsc->wpa2_cred.ssid_len);
|
||||
l_free(str);
|
||||
|
||||
str = l_settings_get_string(settings, "WSC", "WPA2-Passphrase");
|
||||
if (str) {
|
||||
size_t len = strlen(str);
|
||||
|
||||
if (len < 8 || len > 63) {
|
||||
explicit_bzero(str, len);
|
||||
goto err;
|
||||
}
|
||||
|
||||
memcpy(wsc->wpa2_cred.network_key, str, len);
|
||||
wsc->wpa2_cred.network_key_len = len;
|
||||
explicit_bzero(str, len);
|
||||
} else {
|
||||
uint8_t buf[32];
|
||||
|
||||
if (!load_hexencoded(settings, "WPA2-PSK", buf, 32))
|
||||
goto err;
|
||||
|
||||
str = l_util_hexstring(buf, 32);
|
||||
explicit_bzero(buf, 32);
|
||||
memcpy(wsc->wpa2_cred.network_key, str, 64);
|
||||
explicit_bzero(str, 64);
|
||||
free(str);
|
||||
wsc->wpa2_cred.network_key_len = 64;
|
||||
}
|
||||
|
||||
memcpy(wsc->wpa2_cred.addr, wsc->m1->addr, 6);
|
||||
}
|
||||
|
||||
str = l_settings_get_string(settings, "WSC", "Open-SSID");
|
||||
if (str) {
|
||||
if (strlen(str) > 32)
|
||||
goto err;
|
||||
|
||||
wsc->m2->auth_type_flags |= WSC_AUTHENTICATION_TYPE_OPEN;
|
||||
wsc->m2->encryption_type_flags |= WSC_ENCRYPTION_TYPE_NONE;
|
||||
wsc->open_cred.auth_type = WSC_AUTHENTICATION_TYPE_OPEN;
|
||||
wsc->open_cred.encryption_type = WSC_ENCRYPTION_TYPE_NONE;
|
||||
|
||||
wsc->open_cred.ssid_len = strlen(str);
|
||||
memcpy(wsc->open_cred.ssid, str, wsc->open_cred.ssid_len);
|
||||
l_free(str);
|
||||
|
||||
wsc->open_cred.network_key_len = 0;
|
||||
|
||||
memcpy(wsc->open_cred.addr, wsc->m1->addr, 6);
|
||||
}
|
||||
|
||||
if (!wsc->m2->auth_type_flags)
|
||||
goto err;
|
||||
|
||||
wsc->m2->connection_type_flags = WSC_CONNECTION_TYPE_ESS;
|
||||
|
||||
/* Debug settings */
|
||||
if (!load_hexencoded(settings, "RegistrarNonce",
|
||||
wsc->m2->registrar_nonce, 16))
|
||||
l_getrandom(wsc->m2->registrar_nonce, 16);
|
||||
|
||||
if (!load_hexencoded(settings, "IV3", wsc->iv3, 16))
|
||||
l_getrandom(wsc->iv3, 16);
|
||||
|
||||
wsc->state = STATE_EXPECT_IDENTITY;
|
||||
eap_set_data(eap, wsc);
|
||||
|
||||
return true;
|
||||
|
||||
err:
|
||||
eap_wsc_state_free(wsc);
|
||||
return false;
|
||||
}
|
||||
|
||||
static struct eap_method eap_wsc_r = {
|
||||
.name = "WSC-R",
|
||||
.request_type = EAP_TYPE_EXPANDED,
|
||||
.vendor_id = { 0x00, 0x37, 0x2a },
|
||||
.vendor_type = 0x00000001,
|
||||
.exports_msk = true,
|
||||
.free = eap_wsc_free,
|
||||
.load_settings = eap_wsc_r_load_settings,
|
||||
};
|
||||
|
||||
static int eap_wsc_init(void)
|
||||
{
|
||||
int r = -ENOTSUP;
|
||||
|
|
@ -1422,12 +1615,18 @@ static int eap_wsc_init(void)
|
|||
goto fail_prime;
|
||||
|
||||
r = eap_register_method(&eap_wsc);
|
||||
if (r)
|
||||
goto fail_register;
|
||||
|
||||
r = eap_register_method(&eap_wsc_r);
|
||||
if (!r)
|
||||
return 0;
|
||||
|
||||
eap_unregister_method(&eap_wsc);
|
||||
|
||||
fail_register:
|
||||
l_key_free(dh5_prime);
|
||||
dh5_prime = NULL;
|
||||
|
||||
fail_prime:
|
||||
l_key_free(dh5_generator);
|
||||
dh5_generator = NULL;
|
||||
|
|
@ -1440,6 +1639,7 @@ static void eap_wsc_exit(void)
|
|||
l_debug("");
|
||||
|
||||
eap_unregister_method(&eap_wsc);
|
||||
eap_unregister_method(&eap_wsc_r);
|
||||
|
||||
l_key_free(dh5_prime);
|
||||
l_key_free(dh5_generator);
|
||||
|
|
|
|||
Loading…
Reference in New Issue