From ed8452d53ff12647e21dd03e5a2ba24628f09c3b Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 1 Jun 2018 17:58:56 +0300 Subject: [PATCH] EAP-TLS: Derive Session-Id using TLS-Exporter when TLS v1.3 is used This updates Session-Id derivation with TLS v1.3 per draft-ietf-emu-eap-tls13-00. Signed-off-by: Jouni Malinen --- components/wpa_supplicant/src/eap_peer/eap_tls_common.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/wpa_supplicant/src/eap_peer/eap_tls_common.c b/components/wpa_supplicant/src/eap_peer/eap_tls_common.c index 60ef6096bd..f78921d32e 100644 --- a/components/wpa_supplicant/src/eap_peer/eap_tls_common.c +++ b/components/wpa_supplicant/src/eap_peer/eap_tls_common.c @@ -303,6 +303,13 @@ u8 * eap_peer_tls_derive_session_id(struct eap_sm *sm, struct tls_random keys; u8 *out; + if (eap_type == EAP_TYPE_TLS && data->tls_v13) { + *len = 64; + return eap_peer_tls_derive_key(sm, data, + "EXPORTER_EAP_TLS_Session-Id", + 64); + } + /* * TLS library did not support session ID generation, * so get the needed TLS session parameters