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

peap: Add inner EAP key material into imsk calculation

Browse Source 
For the inner EAP methods that support generation of the key material
include it into imck generation. This allows to cryptographically
bind the inner method with the tunnel.
This commit is contained in:
Tim Kourt 2020-01-31 14:25:15 -08:00 committed by Denis Kenzior
parent c2078c703d
commit dc4b7e327e
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/eap-peap.c
View File

@ -46,8 +46,23 @@ struct peap_state {
struct eap_state *phase2; struct eap_state *phase2;
uint8_t key[128]; uint8_t key[128];
uint8_t isk[32];
}; };
static void eap_peap_phase2_key_ready(const uint8_t *msk_data, size_t msk_len,
const uint8_t *emsk_data, size_t emsk_len,
const uint8_t *iv, size_t iv_len,
const uint8_t *session_id, size_t session_len,
void *user_data)
{
struct peap_state *peap_state =
eap_tls_common_get_variant_data(user_data);
l_debug("PEAP: New ISK received");
memcpy(peap_state->isk, msk_data, sizeof(peap_state->isk));
}
static void eap_peap_phase2_send_response(const uint8_t *pdu, size_t pdu_len, static void eap_peap_phase2_send_response(const uint8_t *pdu, size_t pdu_len,
void *user_data) void *user_data)
{ {
@ -103,6 +118,7 @@ static void eap_peap_phase2_complete(enum eap_result result, void *user_data)
eap_set_key_material(eap, peap_state->key + 0, 64, NULL, 0, NULL, eap_set_key_material(eap, peap_state->key + 0, 64, NULL, 0, NULL,
0, NULL, 0); 0, NULL, 0);
explicit_bzero(peap_state->key, sizeof(peap_state->key)); explicit_bzero(peap_state->key, sizeof(peap_state->key));
explicit_bzero(peap_state->isk, sizeof(peap_state->isk));
eap_method_success(eap); eap_method_success(eap);
} }
@ -144,12 +160,9 @@ static bool cryptobinding_tlv_generate_imck(struct eap_state *eap,
{ {
struct peap_state *peap_state = eap_tls_common_get_variant_data(eap); struct peap_state *peap_state = eap_tls_common_get_variant_data(eap);
static const char *label = "Inner Methods Compound Keys"; static const char *label = "Inner Methods Compound Keys";
uint8_t isk[32];
memset(isk, 0, sizeof(isk));
if (!prf_plus_sha1(peap_state->key, 40, label, strlen(label), if (!prf_plus_sha1(peap_state->key, 40, label, strlen(label),
isk, sizeof(isk), imck_out, 60)) peap_state->isk, 32, imck_out, 60))
return false; return false;
return true; return true;
@ -441,6 +454,7 @@ static void eap_extensions_handle_request(struct eap_state *eap,
eap_set_key_material(eap, peap_state->key + 0, 64, NULL, 0, NULL, eap_set_key_material(eap, peap_state->key + 0, 64, NULL, 0, NULL,
0, NULL, 0); 0, NULL, 0);
explicit_bzero(peap_state->key, sizeof(peap_state->key)); explicit_bzero(peap_state->key, sizeof(peap_state->key));
explicit_bzero(peap_state->isk, sizeof(peap_state->isk));
eap_method_success(eap); eap_method_success(eap);
} }
@ -528,6 +542,7 @@ static void eap_peap_state_reset(void *variant_data)
eap_reset(peap_state->phase2); eap_reset(peap_state->phase2);
explicit_bzero(peap_state->key, sizeof(peap_state->key)); explicit_bzero(peap_state->key, sizeof(peap_state->key));
explicit_bzero(peap_state->isk, sizeof(peap_state->isk));
} }
static void eap_peap_state_destroy(void *variant_data) static void eap_peap_state_destroy(void *variant_data)
@ -541,6 +556,7 @@ static void eap_peap_state_destroy(void *variant_data)
eap_free(peap_state->phase2); eap_free(peap_state->phase2);
explicit_bzero(peap_state->key, sizeof(peap_state->key)); explicit_bzero(peap_state->key, sizeof(peap_state->key));
explicit_bzero(peap_state->isk, sizeof(peap_state->isk));
l_free(peap_state); l_free(peap_state);
} }
@ -604,6 +620,8 @@ static bool eap_peap_settings_load(struct eap_state *eap,
peap_state = l_new(struct peap_state, 1); peap_state = l_new(struct peap_state, 1);
peap_state->phase2 = phase2; peap_state->phase2 = phase2;
eap_set_key_material_func(peap_state->phase2,
eap_peap_phase2_key_ready);
snprintf(setting_key_prefix, sizeof(setting_key_prefix), "%sPEAP-", snprintf(setting_key_prefix, sizeof(setting_key_prefix), "%sPEAP-",
prefix); prefix);