Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

eapol: Add OWE to MIC calculate/verify 

This allows eapol to work with the OWE AKM type. Similar shortcuts were
taken as with SAE since, for now, both only support a single ECC group.
This commit is contained in:
James Prestwood 2018-11-16 14:22:52 -08:00 committed by Denis Kenzior
parent d19b1bb85e
commit 126993b9e3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/eapol.c
View File

@ -84,6 +84,8 @@ bool eapol_calculate_mic(enum ie_rsn_akm_suite akm, const uint8_t *kck,
case IE_RSN_AKM_SUITE_SAE_SHA256: case IE_RSN_AKM_SUITE_SAE_SHA256:
case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256: case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256:
return cmac_aes(kck, 16, frame, frame_len, mic, 16); return cmac_aes(kck, 16, frame, frame_len, mic, 16);
case IE_RSN_AKM_SUITE_OWE:
return hmac_sha256(kck, 16, frame, frame_len, mic, 16);
default: default:
return false; return false;
} }
@ -128,6 +130,10 @@ bool eapol_verify_mic(enum ie_rsn_akm_suite akm, const uint8_t *kck,
case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256: case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256:
checksum = l_checksum_new_cmac_aes(kck, 16); checksum = l_checksum_new_cmac_aes(kck, 16);
break; break;
case IE_RSN_AKM_SUITE_OWE:
checksum = l_checksum_new_hmac(L_CHECKSUM_SHA256,
kck, 16);
break;
default: default:
return false; return false;
} }
@ -165,12 +171,12 @@ uint8_t *eapol_decrypt_key_data(enum ie_rsn_akm_suite akm, const uint8_t *kek,
break; break;
case EAPOL_KEY_DESCRIPTOR_VERSION_AKM_DEFINED: case EAPOL_KEY_DESCRIPTOR_VERSION_AKM_DEFINED:
/* /*
* TODO: for now, only SAE is supported under the AKM_DEFINED * TODO: for now, only SAE/OWE (group 19) is supported under the
* key descriptor version. Once 8021x suites are added for this * AKM_DEFINED key descriptor version. Once 8021x suites are
* type this will need to be expanded to handle the AKM types in * added for this type this will need to be expanded to handle
* its own switch. * the AKM types in its own switch.
*/ */
if (!IE_AKM_IS_SAE(akm)) if (!IE_AKM_IS_SAE(akm) && akm != IE_RSN_AKM_SUITE_OWE)
return NULL; return NULL;
/* Fall through */ /* Fall through */