jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

MACsec: Allow EAPOL version 3 to be configured

Browse source 
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Hu Wang 2014-03-31 17:36:55 +03:00 committed by Jouni Malinen
parent 49be483b28
commit 0836c04b30
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/eapol_common.h
View file

@ -26,7 +26,11 @@ struct ieee802_1x_hdr {
#pragma pack(pop) #pragma pack(pop)
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#ifdef CONFIG_MACSEC
#define EAPOL_VERSION 3
#else /* CONFIG_MACSEC */
#define EAPOL_VERSION 2 #define EAPOL_VERSION 2
#endif /* CONFIG_MACSEC */
enum { IEEE802_1X_TYPE_EAP_PACKET = 0, enum { IEEE802_1X_TYPE_EAP_PACKET = 0,
IEEE802_1X_TYPE_EAPOL_START = 1, IEEE802_1X_TYPE_EAPOL_START = 1,

4
wpa_supplicant/config.c
View file

@ -3784,7 +3784,11 @@ static const struct global_parse_data global_fields[] = {
{ FUNC_NO_VAR(no_ctrl_interface), 0 }, { FUNC_NO_VAR(no_ctrl_interface), 0 },
{ STR(ctrl_interface_group), 0 } /* deprecated */, { STR(ctrl_interface_group), 0 } /* deprecated */,
#endif /* CONFIG_CTRL_IFACE */ #endif /* CONFIG_CTRL_IFACE */
#ifdef CONFIG_MACSEC
{ INT_RANGE(eapol_version, 1, 3), 0 },
#else /* CONFIG_MACSEC */
{ INT_RANGE(eapol_version, 1, 2), 0 }, { INT_RANGE(eapol_version, 1, 2), 0 },
#endif /* CONFIG_MACSEC */
{ INT(ap_scan), 0 }, { INT(ap_scan), 0 },
{ FUNC(bgscan), 0 }, { FUNC(bgscan), 0 },
{ INT(disable_scan_offload), 0 }, { INT(disable_scan_offload), 0 },