Attachment #227990 for bug #258527

Lines 3-8 Link Here

(-)b/usr.sbin/wpa/Makefile.crypto (+1 lines)
3	.if ${MK_OPENSSL} != "no"	3	.if ${MK_OPENSSL} != "no"
4	LIBADD+= ssl crypto	4	LIBADD+= ssl crypto
5	CFLAGS+= -DCONFIG_SHA256	5	CFLAGS+= -DCONFIG_SHA256
		6	CFLAGS+= -DCONFIG_ECC
6	.else	7	.else
7	CFLAGS+=-DCONFIG_CRYPTO_INTERNAL	8	CFLAGS+=-DCONFIG_CRYPTO_INTERNAL
8	CONFIG_INTERNAL_AES=y	9	CONFIG_INTERNAL_AES=y




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_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

Lines 26-33 FILES= hostapd.conf hostapd.eap_user hostapd.wpa_psk Link Here

(-)b/usr.sbin/wpa/hostapd/Makefile (-2 lines)
26		26
27	CFLAGS+=-I${.CURDIR:H}/wpa_supplicant \	27	CFLAGS+=-I${.CURDIR:H}/wpa_supplicant \
28	-I${WPA_DISTDIR}/src/eap_peer \	28	-I${WPA_DISTDIR}/src/eap_peer \
29	-DCONFIG_MBO \
30	-DCONFIG_RSN_PREAUTH \
31	-DHOSTAPD	29	-DHOSTAPD
32	.if ${MK_INET6} != "no"	30	.if ${MK_INET6} != "no"
33	CFLAGS+= -DCONFIG_IPV6	31	CFLAGS+= -DCONFIG_IPV6




SRCS=	accounting.c \
	ap_config.c \
	ap_drv_ops.c \
	ap_list.c \
	ap_mlme.c \
	authsrv.c \
	beacon.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 \

	wpa_auth_ie.c \
	wps_hostapd.c

CFLAGS+=-DHOSTAPD
	-DCONFIG_RSN_PREAUTH \
	-DHOSTAPD

# We are only interested in includes at this point. Not libraries.
LIBADD=

Lines 11-16 INTERNALLIB= Link Here

(-)b/usr.sbin/wpa/src/common/Makefile (+1 lines)
11		11
12	SRCS= cli.c \	12	SRCS= cli.c \
13	ctrl_iface_common.c \	13	ctrl_iface_common.c \
		14	dragonfly.c \
14	gas.c \	15	gas.c \
15	hw_features_common.c \	16	hw_features_common.c \
16	ieee802_11_common.c \	17	ieee802_11_common.c \

Lines 16-25 SRCS= pmksa_cache.c \ Link Here

(-)b/usr.sbin/wpa/src/rsn_supp/Makefile (-4 lines)
16	wpa.c \	16	wpa.c \
17	wpa_ie.c	17	wpa_ie.c
18		18
19	CFLAGS+=-DCONFIG_TDLS \
20	-DCONFIG_WNM \
21	-DIEEE8021X_EAPOL
22
23	# We are only interested in includes at this point. Not libraries.	19	# We are only interested in includes at this point. Not libraries.
24	LIBADD=	20	LIBADD=
25		21

Return to bug 258527

Lines 40-47 CFLAGS+=-DCONFIG_IEEE80211AC Link Here

(-)b/usr.sbin/wpa/Makefile.inc (-2 / +3 lines)
40	CFLAGS+=-DCONFIG_IEEE80211N	40	CFLAGS+=-DCONFIG_IEEE80211N
41	CFLAGS+=-DCONFIG_IEEE80211R	41	CFLAGS+=-DCONFIG_IEEE80211R
42	CFLAGS+=-DCONFIG_IEEE80211W	42	CFLAGS+=-DCONFIG_IEEE80211W
43	CFLAGS+=-DCONFIG_IEEE80211AX
44	CFLAGS+=-DNEED_AP_MLME
45	CFLAGS+=-DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\"	43	CFLAGS+=-DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\"
46	CFLAGS+=-DCONFIG_DEBUG_SYSLOG	44	CFLAGS+=-DCONFIG_DEBUG_SYSLOG
47	CFLAGS+=-DCONFIG_WPS	45	CFLAGS+=-DCONFIG_WPS
Lines 54-62 CFLAGS+=-DCONFIG_GAS Link Here
54	CFLAGS+=-DCONFIG_PEERKEY	52	CFLAGS+=-DCONFIG_PEERKEY
55	CFLAGS+=-DCONFIG_PRIVSEP	53	CFLAGS+=-DCONFIG_PRIVSEP
56	CFLAGS+=-DCONFIG_SMARTCARD	54	CFLAGS+=-DCONFIG_SMARTCARD
		55	CFLAGS+=-DCONFIG_TDLS
57	CFLAGS+=-DCONFIG_TERMINATE_ONLASTIF	56	CFLAGS+=-DCONFIG_TERMINATE_ONLASTIF
58	CFLAGS+=-DCONFIG_TLS=openssl	57	CFLAGS+=-DCONFIG_TLS=openssl
59	CFLAGS+=-DCONFIG_MATCH_IFACE	58	CFLAGS+=-DCONFIG_MATCH_IFACE
		59	CFLAGS+=-DCONFIG_PASN
		60	CFLAGS+=-DCONFIG_PTKSA_CACHE
60	CFLAGS+=-DEAP_SERVER	61	CFLAGS+=-DEAP_SERVER
61	CFLAGS+=-DEAP_SERVER_GTC	62	CFLAGS+=-DEAP_SERVER_GTC
62	CFLAGS+=-DEAP_SERVER_IDENTITY	63	CFLAGS+=-DEAP_SERVER_IDENTITY

Lines 12-18 INTERNALLIB= Link Here

(-)b/usr.sbin/wpa/src/ap/Makefile (-8 / +1 lines)
12	SRCS= accounting.c \	12	SRCS= accounting.c \
13	ap_config.c \	13	ap_config.c \
14	ap_drv_ops.c \	14	ap_drv_ops.c \
15	ap_list.c \
16	ap_mlme.c \	15	ap_mlme.c \
17	authsrv.c \	16	authsrv.c \
18	beacon.c \	17	beacon.c \
Lines 24-38 SRCS= accounting.c \ Link Here
24	gas_serv.c \	23	gas_serv.c \
25	hostapd.c \	24	hostapd.c \
26	hs20.c \	25	hs20.c \
27	hw_features.c \
28	ieee802_11.c \
29	ieee802_11_auth.c \	26	ieee802_11_auth.c \
30	ieee802_11_he.c \
31	ieee802_11_ht.c \	27	ieee802_11_ht.c \
32	ieee802_11_shared.c \	28	ieee802_11_shared.c \
33	ieee802_11_vht.c \	29	ieee802_11_vht.c \
34	ieee802_1x.c \	30	ieee802_1x.c \
35	mbo_ap.c \
36	neighbor_db.c \	31	neighbor_db.c \
37	pmksa_cache_auth.c \	32	pmksa_cache_auth.c \
38	preauth_auth.c \	33	preauth_auth.c \
Lines 49-57 SRCS= accounting.c \ Link Here
49	wpa_auth_ie.c \	44	wpa_auth_ie.c \
50	wps_hostapd.c	45	wps_hostapd.c
51		46
52	CFLAGS+=-DCONFIG_MBO \	47	CFLAGS+=-DHOSTAPD
53	-DCONFIG_RSN_PREAUTH \
54	-DHOSTAPD
55		48
56	# We are only interested in includes at this point. Not libraries.	49	# We are only interested in includes at this point. Not libraries.
57	LIBADD=	50	LIBADD=