From f8aed720e4e2a9d7d643769be0a9f2d53d695ddc Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 1 Jun 2018 17:41:59 +0300 Subject: [PATCH] EAP-TLS: Update key derivation label per draft-ietf-emu-eap-tls13-00 The label strings used for deriving Key_Material with TLS v1.3 were changed, so update the implementation to match the new values. Signed-off-by: Jouni Malinen --- src/eap_peer/eap_tls.c | 2 +- src/eap_server/eap_server_tls.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eap_peer/eap_tls.c b/src/eap_peer/eap_tls.c index d50619ea0..cb747026c 100644 --- a/src/eap_peer/eap_tls.c +++ b/src/eap_peer/eap_tls.c @@ -183,7 +183,7 @@ static void eap_tls_success(struct eap_sm *sm, struct eap_tls_data *data, } if (data->ssl.tls_v13) { - label = "client EAP encryption KM"; + label = "EXPORTER_EAP_TLS_Key_Material"; /* A possible NewSessionTicket may be received before * EAP-Success, so need to allow it to be received. */ diff --git a/src/eap_server/eap_server_tls.c b/src/eap_server/eap_server_tls.c index 37ce4cc9f..9d4e69dbe 100644 --- a/src/eap_server/eap_server_tls.c +++ b/src/eap_server/eap_server_tls.c @@ -308,7 +308,7 @@ static u8 * eap_tls_getKey(struct eap_sm *sm, void *priv, size_t *len) return NULL; if (data->ssl.tls_v13) - label = "client EAP encryption KM"; + label = "EXPORTER_EAP_TLS_Key_Material"; else label = "client EAP encryption"; eapKeyData = eap_server_tls_derive_key(sm, &data->ssl, label,