Fix build when WITHOUT_WPA_SUPPLICANT_EAPOL option used.
The build failure was discoved by Michael Dexter's recent Build Options Survey run, at https://callfortesting.org/results/bos-2020-01-16/\ WITHOUT_WPA_SUPPLICANT_EAPOL-small.txt. Reported by: Michael Dexter <editor@callfortesting.org> via emaste MFC after: 2 weeks
This commit is contained in:
parent
c5f4e26e7d
commit
5a00480bb9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=356949
@ -16,19 +16,15 @@ SRCS= base64.c bitfield.c blacklist.c bss.c cli.c common.c \
|
|||||||
ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
|
ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
|
||||||
dh_groups.c driver_bsd.c driver_common.c \
|
dh_groups.c driver_bsd.c driver_common.c \
|
||||||
driver_ndis.c driver_wired.c driver_wired_common.c drivers.c \
|
driver_ndis.c driver_wired.c driver_wired_common.c drivers.c \
|
||||||
eap_register.c eap_wsc.c eap_wsc_common.c eloop.c \
|
eap_register.c eloop.c \
|
||||||
events.c gas.c gas_query.c hs20_supplicant.c \
|
events.c gas.c gas_query.c \
|
||||||
http_client.c http_server.c \
|
http_client.c http_server.c \
|
||||||
httpread.c hw_features_common.c \
|
httpread.c hw_features_common.c \
|
||||||
ieee802_11_common.c interworking.c l2_packet_freebsd.c main.c \
|
ieee802_11_common.c l2_packet_freebsd.c main.c \
|
||||||
notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \
|
notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \
|
||||||
rrm.c scan.c upnp_xml.c uuid.c \
|
rrm.c scan.c upnp_xml.c \
|
||||||
wmm_ac.c wpa.c wpa_common.c wpa_ctrl.c \
|
wmm_ac.c wpa.c wpa_common.c wpa_ctrl.c \
|
||||||
wpa_debug.c wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c \
|
wpa_debug.c wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c \
|
||||||
wps.c wps_attr_build.c wps_attr_parse.c wps_attr_process.c \
|
|
||||||
wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \
|
|
||||||
wps_supplicant.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \
|
|
||||||
wps_upnp_ssdp.c wps_upnp_web.c \
|
|
||||||
Packet32.c
|
Packet32.c
|
||||||
|
|
||||||
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
|
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
|
||||||
@ -45,15 +41,12 @@ CFLAGS+=-DCONFIG_BACKEND_FILE \
|
|||||||
-DCONFIG_DRIVER_NDIS \
|
-DCONFIG_DRIVER_NDIS \
|
||||||
-DCONFIG_DRIVER_WIRED \
|
-DCONFIG_DRIVER_WIRED \
|
||||||
-DCONFIG_GAS \
|
-DCONFIG_GAS \
|
||||||
-DCONFIG_HS20 \
|
|
||||||
-DCONFIG_IEEE80211R \
|
-DCONFIG_IEEE80211R \
|
||||||
-DCONFIG_INTERWORKING \
|
|
||||||
-DCONFIG_PEERKEY \
|
-DCONFIG_PEERKEY \
|
||||||
-DCONFIG_PRIVSEP \
|
-DCONFIG_PRIVSEP \
|
||||||
-DCONFIG_SMARTCARD \
|
-DCONFIG_SMARTCARD \
|
||||||
-DCONFIG_TERMINATE_ONLASTIF \
|
-DCONFIG_TERMINATE_ONLASTIF \
|
||||||
-DCONFIG_TLS=openssl \
|
-DCONFIG_TLS=openssl \
|
||||||
-DCONFIG_WPS \
|
|
||||||
-DCONFIG_WPS2 \
|
-DCONFIG_WPS2 \
|
||||||
-DCONFIG_WPS_UPNP \
|
-DCONFIG_WPS_UPNP \
|
||||||
-DPKCS12_FUNCS
|
-DPKCS12_FUNCS
|
||||||
@ -67,7 +60,10 @@ LDADD+=${WPA_SUPPLICANT_LDADD}
|
|||||||
#LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}
|
#LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}
|
||||||
|
|
||||||
.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
|
.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
|
||||||
CFLAGS+=-DEAP_GTC \
|
CFLAGS+=-DCONFIG_WPS \
|
||||||
|
-DCONFIG_HS20 \
|
||||||
|
-DCONFIG_INTERWORKING \
|
||||||
|
-DEAP_GTC \
|
||||||
-DEAP_LEAP \
|
-DEAP_LEAP \
|
||||||
-DEAP_MD5 \
|
-DEAP_MD5 \
|
||||||
-DEAP_MSCHAPv2 \
|
-DEAP_MSCHAPv2 \
|
||||||
@ -76,6 +72,7 @@ CFLAGS+=-DEAP_GTC \
|
|||||||
-DEAP_PSK \
|
-DEAP_PSK \
|
||||||
-DEAP_TLS \
|
-DEAP_TLS \
|
||||||
-DEAP_TTLS \
|
-DEAP_TTLS \
|
||||||
|
-DEAP_WSC \
|
||||||
-DIEEE8021X_EAPOL
|
-DIEEE8021X_EAPOL
|
||||||
SRCS+= chap.c \
|
SRCS+= chap.c \
|
||||||
eap.c \
|
eap.c \
|
||||||
@ -93,14 +90,23 @@ SRCS+= chap.c \
|
|||||||
eap_tls.c \
|
eap_tls.c \
|
||||||
eap_tls_common.c \
|
eap_tls_common.c \
|
||||||
eap_ttls.c \
|
eap_ttls.c \
|
||||||
|
eap_wsc.c \
|
||||||
eapol_supp_sm.c \
|
eapol_supp_sm.c \
|
||||||
|
eap_wsc_common.c \
|
||||||
|
hs20_supplicant.c \
|
||||||
|
interworking.c \
|
||||||
ms_funcs.c \
|
ms_funcs.c \
|
||||||
mschapv2.c
|
mschapv2.c \
|
||||||
TLS_FUNCS=y
|
uuid.c \
|
||||||
|
wps.c wps_attr_build.c wps_attr_parse.c wps_attr_process.c \
|
||||||
|
wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \
|
||||||
|
wps_supplicant.c wps_upnp.c wps_upnp_ap.c wps_upnp_event.c \
|
||||||
|
wps_upnp_ssdp.c wps_upnp_web.c
|
||||||
NEED_AES_EAX=y
|
NEED_AES_EAX=y
|
||||||
NEED_AES_ENCBLOCK=y
|
NEED_AES_ENCBLOCK=y
|
||||||
NEED_AES_OMAC1=y
|
NEED_AES_OMAC1=y
|
||||||
.endif
|
.endif
|
||||||
|
TLS_FUNCS=y
|
||||||
|
|
||||||
.if !empty(CFLAGS:M*-DEAP_AKA)
|
.if !empty(CFLAGS:M*-DEAP_AKA)
|
||||||
SRCS+= eap_aka.c
|
SRCS+= eap_aka.c
|
||||||
|
Loading…
Reference in New Issue
Block a user