|
@@ -253,6 +253,7 @@ static int eap_peap_derive_cmk(struct eap_sm *sm, struct eap_peap_data *data)
|
|
|
{
|
|
|
u8 *tk;
|
|
|
u8 isk[32], imck[60];
|
|
|
+ int resumed;
|
|
|
|
|
|
/*
|
|
|
* Tunnel key (TK) is the first 60 octets of the key generated by
|
|
@@ -263,8 +264,12 @@ static int eap_peap_derive_cmk(struct eap_sm *sm, struct eap_peap_data *data)
|
|
|
return -1;
|
|
|
wpa_hexdump_key(MSG_DEBUG, "EAP-PEAP: TK", tk, 60);
|
|
|
|
|
|
- if (data->reauth &&
|
|
|
- tls_connection_resumed(sm->ssl_ctx, data->ssl.conn)) {
|
|
|
+ resumed = tls_connection_resumed(sm->ssl_ctx, data->ssl.conn);
|
|
|
+ wpa_printf(MSG_DEBUG,
|
|
|
+ "EAP-PEAP: CMK derivation - reauth=%d resumed=%d phase2_eap_started=%d phase2_success=%d",
|
|
|
+ data->reauth, resumed, data->phase2_eap_started,
|
|
|
+ data->phase2_success);
|
|
|
+ if (data->reauth && !data->phase2_eap_started && resumed) {
|
|
|
/* Fast-connect: IPMK|CMK = TK */
|
|
|
os_memcpy(data->ipmk, tk, 40);
|
|
|
wpa_hexdump_key(MSG_DEBUG, "EAP-PEAP: IPMK from TK",
|