diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto index a65ee29e0ebe..2046c32d76ac 100644 --- a/usr.sbin/wpa/Makefile.crypto +++ b/usr.sbin/wpa/Makefile.crypto @@ -1,60 +1,61 @@ # $FreeBSD$ .if ${MK_OPENSSL} != "no" LIBADD+= ssl crypto CFLAGS+= -DCONFIG_SHA256 +CFLAGS+= -DCONFIG_ECC .else CFLAGS+=-DCONFIG_CRYPTO_INTERNAL CONFIG_INTERNAL_AES=y CONFIG_INTERNAL_DES=y CONFIG_INTERNAL_MD4=y CONFIG_INTERNAL_MD5=y CONFIG_INTERNAL_RC4=y CONFIG_INTERNAL_SHA1=y NEED_SHA256=y CONFIG_INTERNAL_SHA256=y NEED_SHA384=y CONFIG_INTERNAL_SHA384=y NEED_SHA512=y CONFIG_INTERNAL_SHA512=y CONFIG_INTERNAL_TLS=y NEED_DH_GROUPS=y CONFIG_INTERNAL_DH5=y NEED_AES_ENC=true NEED_AES_CBC=true .endif NEED_AES_OMAC1=true TLS_FUNCS=y .if defined(TLS_FUNCS) NEED_TLS_PRF=y .if defined(CONFIG_INTERNAL_TLS) CFLAGS+=-DCONFIG_INTERNAL_LIBTOMMATH \ -DCONFIG_TLS_INTERNAL_CLIENT NEED_DES=y NEED_MD4=y NEED_RC4=y .else CFLAGS+=-DEAP_TLS_OPENSSL .endif .endif .if defined(NEED_AES_EAX) NEED_AES_CTR=y .endif .if defined(NEED_SHA256) CFLAGS+=-DCONFIG_SHA256 .endif .if defined(NEED_SHA384) CFLAGS+=-DCONFIG_SHA384 .endif .if defined(NEED_SHA512) CFLAGS+=-DCONFIG_SHA512 .endif .if defined(NEED_DH_GROUPS_ALL) CFLAGS+=-DALL_DH_GROUPS .endif diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index ef94c7b312a9..49c7344e8957 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -1,106 +1,107 @@ # $FreeBSD$ .include BINDIR?= /usr/sbin WARNS?= 0 WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd .PATH.c:${.CURDIR:H} CFLAGS+=-I${.CURDIR} CFLAGS+=-I${HOSTAPD_DISTDIR} CFLAGS+=-I${WPA_DISTDIR}/src CFLAGS+=-I${WPA_DISTDIR}/src/ap CFLAGS+=-I${WPA_DISTDIR}/src/common CFLAGS+=-I${WPA_DISTDIR}/src/crypto CFLAGS+=-I${WPA_DISTDIR}/src/drivers CFLAGS+=-I${WPA_DISTDIR}/src/eap_common CFLAGS+=-I${WPA_DISTDIR}/src/eap_peer CFLAGS+=-I${WPA_DISTDIR}/src/eap_server CFLAGS+=-I${WPA_DISTDIR}/src/eapol_auth CFLAGS+=-I${WPA_DISTDIR}/src/eapol_supp CFLAGS+=-I${WPA_DISTDIR}/src/l2_packet CFLAGS+=-I${WPA_DISTDIR}/src/radius CFLAGS+=-I${WPA_DISTDIR}/src/rsn_supp CFLAGS+=-I${WPA_DISTDIR}/src/tls CFLAGS+=-I${WPA_DISTDIR}/src/utils CFLAGS+=-I${WPA_DISTDIR}/src/wps CFLAGS+=-DCONFIG_DRIVER_BSD CFLAGS+=-DCONFIG_DRIVER_WIRED CFLAGS+=-DCONFIG_DRIVER_RADIUS_ACL CFLAGS+=-DCONFIG_CTRL_IFACE CFLAGS+=-DCONFIG_CTRL_IFACE_UNIX CFLAGS+=-DCONFIG_IEEE80211AC CFLAGS+=-DCONFIG_IEEE80211N CFLAGS+=-DCONFIG_IEEE80211R CFLAGS+=-DCONFIG_IEEE80211W -CFLAGS+=-DCONFIG_IEEE80211AX -CFLAGS+=-DNEED_AP_MLME CFLAGS+=-DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\" CFLAGS+=-DCONFIG_DEBUG_SYSLOG CFLAGS+=-DCONFIG_WPS CFLAGS+=-DCONFIG_WPS2 CFLAGS+=-DCONFIG_WPS_UPNP CFLAGS+=-DCONFIG_WPS_OOB CFLAGS+=-DCONFIG_INTERWORKING CFLAGS+=-DPKCS12_FUNCS CFLAGS+=-DCONFIG_GAS CFLAGS+=-DCONFIG_PEERKEY CFLAGS+=-DCONFIG_PRIVSEP CFLAGS+=-DCONFIG_SMARTCARD +CFLAGS+=-DCONFIG_TDLS CFLAGS+=-DCONFIG_TERMINATE_ONLASTIF CFLAGS+=-DCONFIG_TLS=openssl CFLAGS+=-DCONFIG_MATCH_IFACE +CFLAGS+=-DCONFIG_PASN +CFLAGS+=-DCONFIG_PTKSA_CACHE CFLAGS+=-DEAP_SERVER CFLAGS+=-DEAP_SERVER_GTC CFLAGS+=-DEAP_SERVER_IDENTITY CFLAGS+=-DEAP_SERVER_MD5 CFLAGS+=-DEAP_SERVER_MSCHAPV2 CFLAGS+=-DEAP_SERVER_PEAP CFLAGS+=-DEAP_SERVER_TLS CFLAGS+=-DEAP_SERVER_TTLS CFLAGS+=-DEAP_SERVER_WSC CFLAGS+=-DEAP_TLS_FUNCS .if ${MK_WPA_SUPPLICANT_EAPOL} != "no" CFLAGS+=-DCONFIG_HS20 \ -DEAP_GTC \ -DEAP_LEAP \ -DEAP_MD5 \ -DEAP_MSCHAPv2 \ -DEAP_OTP \ -DEAP_PEAP \ -DEAP_PSK \ -DEAP_TLS \ -DEAP_TTLS \ -DEAP_WSC \ -DIEEE8021X_EAPOL NEED_AES_EAX=y NEED_AES_ENCBLOCK=y NEED_AES_OMAC1=y .endif .if !empty(CFLAGS:M*-DEAP_AKA) NEED_SIM_COMMON=y NEED_AES_CBC=y .endif .if !empty(CFLAGS:M*-DEAP_SIM) NEED_SIM_COMMON=y NEED_AES_CBC=y .endif .if defined(NEED_SIM_COMMON) NEED_FIPS186_2_PRF=y .endif .if !empty(CFLAGS:M*-DEAP_GPSK) CFLAGS+=-DEAP_GPSK_SHA256 NEED_AES_OMAC1=y .endif diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 1ae4481a863e..ce3b7d82fd69 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -1,72 +1,70 @@ # $FreeBSD$ .include .include "../Makefile.inc" .include "../Makefile.crypto" .PATH.c:${HOSTAPD_DISTDIR} \ ${WPA_DISTDIR}/src/drivers PACKAGE= hostapd PROG= hostapd SRCS= config_file.c \ ctrl_iface.c \ driver_bsd.c \ eap_register.c \ main.c MAN= hostapd.8 hostapd.conf.5 .if ${MK_EXAMPLES} != "no" FILESDIR= ${SHAREDIR}/examples/hostapd .PATH: ${HOSTAPD_DISTDIR} FILES= hostapd.conf hostapd.eap_user hostapd.wpa_psk .endif CFLAGS+=-I${.CURDIR:H}/wpa_supplicant \ -I${WPA_DISTDIR}/src/eap_peer \ - -DCONFIG_MBO \ - -DCONFIG_RSN_PREAUTH \ -DHOSTAPD .if ${MK_INET6} != "no" CFLAGS+= -DCONFIG_IPV6 .endif #CFLAGS+= -g LIBADD+= pcap util \ wpadrivers wpaap wpal2_packet wpaeap_server \ wpaeapol_auth wpaeap_common \ wparadius wpatls wpawps wpacommon wpacrypto wpautils # User customizations for wpa_supplicant/hostapd build environment CFLAGS+=${HOSTAPD_CFLAGS} #DPADD+=${HOSTAPD_DPADD} LDADD+=${HOSTAPD_LDADD} #LDFLAGS+=${HOSTAPD_LDFLAGS} # For WPS, EAP modes, etc NEED_DH_GROUPS=y NEED_DH_GROUPS_ALL=y .if !empty(CFLAGS:M*-DCONFIG_WPS) NEED_SIM_COMMON=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_AKA) NEED_SIM_COMMON=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_SIM) NEED_SIM_COMMON=y .endif .if defined(NEED_SIM_COMMON) NEED_FIPS186_2_PRF=y .endif .if !empty(CFLAGS:M*-DEAP_SERVER_GPSK) CFLAGS+=-DEAP_GPSK_SHA256 NEED_AES_OMAC1=y .endif .include diff --git a/usr.sbin/wpa/src/ap/Makefile b/usr.sbin/wpa/src/ap/Makefile index 77caf1ed8efe..b6d53b0d5dbb 100644 --- a/usr.sbin/wpa/src/ap/Makefile +++ b/usr.sbin/wpa/src/ap/Makefile @@ -1,59 +1,52 @@ .include .include "../../Makefile.inc" .include "../../Makefile.crypto" LIB= wpaap INTERNALLIB= .PATH: ${WPA_DISTDIR}/src/ap SRCS= accounting.c \ ap_config.c \ ap_drv_ops.c \ - ap_list.c \ ap_mlme.c \ authsrv.c \ beacon.c \ bss_load.c \ ctrl_iface_ap.c \ dfs.c \ drv_callbacks.c \ eap_user_db.c \ gas_serv.c \ hostapd.c \ hs20.c \ - hw_features.c \ - ieee802_11.c \ ieee802_11_auth.c \ - ieee802_11_he.c \ ieee802_11_ht.c \ ieee802_11_shared.c \ ieee802_11_vht.c \ ieee802_1x.c \ - mbo_ap.c \ neighbor_db.c \ pmksa_cache_auth.c \ preauth_auth.c \ rrm.c \ sta_info.c \ tkip_countermeasures.c \ utils.c \ vlan.c \ vlan_ifconfig.c \ vlan_init.c \ wmm.c \ wpa_auth.c \ wpa_auth_glue.c \ wpa_auth_ie.c \ wps_hostapd.c -CFLAGS+=-DCONFIG_MBO \ - -DCONFIG_RSN_PREAUTH \ - -DHOSTAPD +CFLAGS+=-DHOSTAPD # We are only interested in includes at this point. Not libraries. LIBADD= .include diff --git a/usr.sbin/wpa/src/common/Makefile b/usr.sbin/wpa/src/common/Makefile index b415b926c207..99c4c04fb7fe 100644 --- a/usr.sbin/wpa/src/common/Makefile +++ b/usr.sbin/wpa/src/common/Makefile @@ -1,27 +1,28 @@ .include .include "../../Makefile.inc" .include "../../Makefile.crypto" LIB= wpacommon INTERNALLIB= .PATH: ${WPA_DISTDIR}/src/common SRCS= cli.c \ ctrl_iface_common.c \ + dragonfly.c \ gas.c \ hw_features_common.c \ ieee802_11_common.c \ wpa_common.c \ wpa_ctrl.c CFLAGS+=-DCONFIG_SAE \ -DCONFIG_SUITE \ -DCONFIG_SUITEB # We are only interested in includes at this point. Not libraries. LIBADD= .include diff --git a/usr.sbin/wpa/src/rsn_supp/Makefile b/usr.sbin/wpa/src/rsn_supp/Makefile index 4d952c2204c4..3ffa1e524890 100644 --- a/usr.sbin/wpa/src/rsn_supp/Makefile +++ b/usr.sbin/wpa/src/rsn_supp/Makefile @@ -1,26 +1,22 @@ .include .include "../../Makefile.inc" .include "../../Makefile.crypto" LIB= wparsn_supp INTERNALLIB= .PATH: ${WPA_DISTDIR}/src/rsn_supp SRCS= pmksa_cache.c \ wpa_ft.c \ tdls.c \ preauth.c \ wpa.c \ wpa_ie.c -CFLAGS+=-DCONFIG_TDLS \ - -DCONFIG_WNM \ - -DIEEE8021X_EAPOL - # We are only interested in includes at this point. Not libraries. LIBADD= .include