EAP-TLS server: Fix EMSK derivation with TLS v1.3

The new label string for TLS-Exporter was taken into use for MSK
derivation, but it was missed from EMSK deriation in the server side
implementation.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/eap_server/eap_server_tls.c b/src/eap_server/eap_server_tls.c
index 9d4e69dbeabf64b2ecc69b839d94ce51b046f108..8b9e53c61d799c2274c21549aaa924d32fc8c28c 100644 (file)
--- a/src/eap_server/eap_server_tls.c
+++ b/src/eap_server/eap_server_tls.c
@@ -330,11 +330,15 @@ static u8 * eap_tls_get_emsk(struct eap_sm *sm, void *priv, size_t *len)
 {
        struct eap_tls_data *data = priv;
        u8 *eapKeyData, *emsk;
-       const char *label = "client EAP encryption";
+       const char *label;
 
        if (data->state != SUCCESS)
                return NULL;
 
+       if (data->ssl.tls_v13)
+               label = "EXPORTER_EAP_TLS_Key_Material";
+       else
+               label = "client EAP encryption";
        eapKeyData = eap_server_tls_derive_key(sm, &data->ssl, label,
                                               EAP_TLS_KEY_LEN + EAP_EMSK_LEN);
        if (eapKeyData) {