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 <j@w1.fi>

diff --git a/src/eap_peer/eap_tls.c b/src/eap_peer/eap_tls.c
index d50619ea0fb5f968fb5a43cc7ce34f2d45f8d9b8..cb747026cb8a59765412b2ff2c93a11a086adf84 100644 (file)
--- 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 37ce4cc9f33cd6b0d50b4096685022c96fd29a98..9d4e69dbeabf64b2ecc69b839d94ce51b046f108 100644 (file)
--- 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,