From: Jaap Keuter Date: Tue, 11 Apr 2017 15:22:36 +0000 (+0200) Subject: Make CONFIG_MACSEC depend on IEEE8021X_EAPOL X-Git-Tag: hostap_2_7~1320 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61363945452b061eff166e1ada065aa1ddf9fe54;p=thirdparty%2Fhostap.git Make CONFIG_MACSEC depend on IEEE8021X_EAPOL When reducing the configuration for MACsec/MKA to the bare minimum, so no EAP authentication, just MACsec/MKA SA use with preshared key/name, the EAPOL engine is still needed to run the protocol for MKA. Without any EAP authentication options the IEEE8021X_EAPOL option is not set, resulting in a non-working Key Agreement Entity. Therefore the CONFIG_MACSEC block needs to move up and set the IEEE8021X_EAPOL option. Signed-off-by: Jaap Keuter --- diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 1f36ae787..28ef52ad3 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -822,20 +822,9 @@ endif endif endif -ifdef CONFIG_IEEE8021X_EAPOL -# IEEE 802.1X/EAPOL state machines (e.g., for RADIUS authentication) -CFLAGS += -DIEEE8021X_EAPOL -OBJS += ../src/eapol_supp/eapol_supp_sm.o -OBJS += ../src/eap_peer/eap.o ../src/eap_peer/eap_methods.o -NEED_EAP_COMMON=y -ifdef CONFIG_DYNAMIC_EAP_METHODS -CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS -LIBS += -ldl -rdynamic -endif -endif - ifdef CONFIG_MACSEC CFLAGS += -DCONFIG_MACSEC +CONFIG_IEEE8021X_EAPOL=y NEED_AES_ENCBLOCK=y NEED_AES_UNWRAP=y NEED_AES_WRAP=y @@ -847,6 +836,18 @@ OBJS += ../src/pae/ieee802_1x_key.o OBJS += ../src/pae/ieee802_1x_secy_ops.o endif +ifdef CONFIG_IEEE8021X_EAPOL +# IEEE 802.1X/EAPOL state machines (e.g., for RADIUS authentication) +CFLAGS += -DIEEE8021X_EAPOL +OBJS += ../src/eapol_supp/eapol_supp_sm.o +OBJS += ../src/eap_peer/eap.o ../src/eap_peer/eap_methods.o +NEED_EAP_COMMON=y +ifdef CONFIG_DYNAMIC_EAP_METHODS +CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS +LIBS += -ldl -rdynamic +endif +endif + ifdef CONFIG_AP NEED_EAP_COMMON=y NEED_RSN_AUTHENTICATOR=y