feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

EAP-PEAP: Key derivation per draft-ietf-emu-tls-eap-types-00

Browse Source 
Use the TLS-Exporter with the label and context as defined in
draft-ietf-emu-tls-eap-types-00 when deriving keys for PEAP with TLS
1.3.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
This commit is contained in:
Alexander Clouter
2020-10-16 09:49:38 +01:00
committed by Sarvesh Bodakhe
parent 252dd1b976
commit 0d90484018
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/wpa_supplicant/src/eap_peer/eap_peap.c
View File

@@ -1190,7 +1190,11 @@ static struct wpabuf * eap_peap_process(struct eap_sm *sm, void *priv,
if (tls_connection_established(sm->ssl_ctx, data->ssl.conn)) { if (tls_connection_established(sm->ssl_ctx, data->ssl.conn)) {
char label[24] = {0}; const char *label;
const u8 eap_tls13_context[1] = { EAP_TYPE_PEAP };
const u8 *context = NULL;
size_t context_len = 0;
wpa_printf(MSG_DEBUG, "EAP-PEAP: TLS done, proceed to Phase 2"); wpa_printf(MSG_DEBUG, "EAP-PEAP: TLS done, proceed to Phase 2");
eap_peap_free_key(data); eap_peap_free_key(data);
/* draft-josefsson-ppext-eap-tls-eap-05.txt /* draft-josefsson-ppext-eap-tls-eap-05.txt
@@ -1199,16 +1203,25 @@ static struct wpabuf * eap_peap_process(struct eap_sm *sm, void *priv,
* PEAPv1 implementations seem to be using the old * PEAPv1 implementations seem to be using the old
* label, "client EAP encryption", instead. Use the old * label, "client EAP encryption", instead. Use the old
* label by default, but allow it to be configured with * label by default, but allow it to be configured with
* phase1 parameter peaplabel=1. */ * phase1 parameter peaplabel=1.
if (data->peap_version > 1 || data->force_new_label) *
os_strlcpy(label, "client PEAP encryption", 24); * When using TLS 1.3, draft-ietf-emu-tls-eap-types
else * defines a new set of label and context parameters.
os_strlcpy(label, "client EAP encryption", 24); */
if (data->ssl.tls_v13) {
label = "EXPORTER_EAP_TLS_Key_Material";
context = eap_tls13_context;
context_len = sizeof(eap_tls13_context);
} else if (data->force_new_label) {
label = "client PEAP encryption";
} else {
label = "client EAP encryption";
}
wpa_printf(MSG_DEBUG, "EAP-PEAP: using label '%s' in " wpa_printf(MSG_DEBUG, "EAP-PEAP: using label '%s' in "
"key derivation", label); "key derivation", label);
data->key_data = data->key_data =
eap_peer_tls_derive_key(sm, &data->ssl, label, eap_peer_tls_derive_key(sm, &data->ssl, label,
NULL, 0, context, context_len,
EAP_TLS_KEY_LEN + EAP_TLS_KEY_LEN +
EAP_EMSK_LEN); EAP_EMSK_LEN);
if (data->key_data) { if (data->key_data) {