diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index b19ae26b22d4..0a69ca08166b 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 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} \
 	${WPA_DISTDIR}/src/common \
 	${WPA_DISTDIR}/src/crypto \
 	${WPA_DISTDIR}/src/eapol_auth \
 	${WPA_DISTDIR}/src/eap_common \
 	${WPA_DISTDIR}/src/eapol_supp \
 	${WPA_DISTDIR}/src/l2_packet \
 	${WPA_DISTDIR}/src/radius \
 	${WPA_DISTDIR}/src/rsn_supp \
 	${WPA_DISTDIR}/src/tls \
+	${WPA_DISTDIR}/src/utils \
 	${WPA_DISTDIR}/src/wps
 
 CFLAGS+=-I${.CURDIR}
 CFLAGS+=-I${HOSTAPD_DISTDIR}
 CFLAGS+=-I${WPA_DISTDIR}/src
 CFLAGS+=-I${WPA_DISTDIR}/src/common
 CFLAGS+=-I${WPA_DISTDIR}/src/crypto
 CFLAGS+=-I${WPA_DISTDIR}/src/drivers
 CFLAGS+=-I${WPA_DISTDIR}/src/l2_packet
 CFLAGS+=-I${WPA_DISTDIR}/src/utils
 CFLAGS+=-I${WPA_DISTDIR}/src/wps
 
 CFLAGS+= -DCONFIG_CTRL_IFACE
 CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 CFLAGS+= -DNEED_AP_MLME
 CFLAGS+= -DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\"
 
 .include <bsd.own.mk>
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index bd32f8db052e..579694046989 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -1,211 +1,209 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 .include "../Makefile.inc"
 
 .PATH.c:${HOSTAPD_DISTDIR} \
 	${WPA_DISTDIR}/src/ap \
 	${WPA_DISTDIR}/src/eap_server \
 	${WPA_DISTDIR}/src/eap_peer \
 	${WPA_DISTDIR}/src/drivers \
-	${WPA_DISTDIR}/src/utils \
 	${WPA_DISTDIR}/wpa_supplicant
 
 PACKAGE=	hostapd
 PROG=	hostapd
 SRCS=	accounting.c \
 	ap_config.c \
 	ap_drv_ops.c \
 	ap_list.c \
 	ap_mlme.c \
 	authsrv.c \
 	base64.c \
 	beacon.c \
 	bss_load.c \
 	chap.c \
 	common.c \
 	config_file.c \
-	crc32.c \
 	ctrl_iface.c \
 	ctrl_iface_ap.c \
 	ctrl_iface_common.c \
 	dfs.c \
 	driver_bsd.c \
 	driver_common.c \
 	drivers.c \
 	drv_callbacks.c \
 	eloop.c \
 	gas.c \
 	gas_serv.c \
 	http_client.c \
 	http_server.c \
 	httpread.c \
 	hostapd.c \
 	hs20.c \
 	hw_features.c \
 	hw_features_common.c \
 	ieee802_11.c \
 	ieee802_11_auth.c \
 	ieee802_11_common.c \
 	ieee802_11_he.c \
 	ieee802_11_ht.c \
 	ieee802_11_shared.c \
 	ieee802_11_vht.c \
 	ieee802_1x.c \
 	ip_addr.c \
 	l2_packet_freebsd.c \
 	main.c \
 	mbo_ap.c \
 	ms_funcs.c \
 	neighbor_db.c \
 	os_unix.c \
 	pmksa_cache_auth.c \
 	preauth_auth.c \
 	radius.c \
 	radius_client.c \
 	radius_das.c \
 	rrm.c \
 	sta_info.c \
 	tkip_countermeasures.c \
 	upnp_xml.c \
 	utils.c \
 	uuid.c \
 	vlan.c \
 	vlan_ifconfig.c \
 	vlan_init.c \
 	wmm.c \
 	wpa_auth.c \
 	wpa_auth_glue.c \
 	wpa_auth_ie.c \
 	wpa_common.c \
 	wpa_ctrl.c \
 	wpa_debug.c \
 	wpabuf.c \
 	wps.c \
 	wps_attr_build.c \
 	wps_attr_process.c \
 	wps_attr_parse.c \
 	wps_common.c \
 	wps_dev_attr.c \
 	wps_enrollee.c \
 	wps_hostapd.c \
 	wps_registrar.c \
 	wps_upnp.c \
 	wps_upnp_ap.c \
 	wps_upnp_event.c \
 	wps_upnp_ssdp.c \
 	wps_upnp_web.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_DRIVER_BSD \
 	-DCONFIG_DRIVER_RADIUS_ACL \
 	-DCONFIG_HS20 \
 	-DCONFIG_MBO \
 	-DCONFIG_IEEE80211N \
 	-DCONFIG_IEEE80211W \
 	-DCONFIG_IEEE80211AC \
 	-DCONFIG_IEEE80211AX \
 	-DCONFIG_INTERWORKING \
 	-DCONFIG_PEERKEY \
 	-DCONFIG_RSN_PREAUTH \
 	-DCONFIG_WPS \
 	-DCONFIG_WPS2 \
 	-DCONFIG_WPS_UPNP \
 	-DHOSTAPD
 .if ${MK_INET6} != "no"
 CFLAGS+= -DCONFIG_IPV6
 .endif
 #CFLAGS+= -g
 LIBADD+=	pcap util
 
 # User customizations for wpa_supplicant/hostapd build environment
 CFLAGS+=${HOSTAPD_CFLAGS}
 #DPADD+=${HOSTAPD_DPADD}
 LDADD+=${HOSTAPD_LDADD}
 #LDFLAGS+=${HOSTAPD_LDFLAGS}
 
 CFLAGS+=-DDPKCS12_FUNCS \
 	-DEAP_SERVER \
 	-DEAP_SERVER_GTC \
 	-DEAP_SERVER_IDENTITY \
 	-DEAP_SERVER_MD5 \
 	-DEAP_SERVER_MSCHAPV2 \
 	-DEAP_SERVER_PEAP \
 	-DEAP_SERVER_TLS \
 	-DEAP_SERVER_TTLS \
 	-DEAP_SERVER_WSC \
 	-DEAP_TLS_FUNCS
 
 SRCS+=	eap_server_gtc.c \
 	eap_common.c \
 	eap_peap_common.c \
 	eap_register.c \
 	eap_server.c \
 	eap_server_identity.c \
 	eap_server_md5.c \
 	eap_server_methods.c \
 	eap_server_mschapv2.c \
 	eap_server_peap.c \
 	eap_server_tls.c \
 	eap_server_tls_common.c \
 	eap_server_ttls.c \
 	eap_server_wsc.c \
 	eap_user_db.c \
 	eap_wsc_common.c \
 	eapol_auth_dump.c \
 	eapol_auth_sm.c
 TLS_FUNCS=y
 
 # 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)
 SRCS+=	eap_server_aka.c
 NEED_SIM_COMMON=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_SIM)
 SRCS+=	eap_server_sim.c
 NEED_SIM_COMMON=y
 .endif
 
 .if defined(NEED_SIM_COMMON)
 SRCS+=	eap_sim_common.c \
 	eap_sim_db.c
 NEED_FIPS186_2_PRF=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_GPSK)
 CFLAGS+=-DEAP_GPSK_SHA256
 SRCS+=	eap_server_gpsk.c \
 	eap_gpsk_common.c
 NEED_AES_OMAC1=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_PAX)
 SRCS+=	eap_server_pax.c \
 	eap_pax_common.c
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_SAKE)
 SRCS+=	eap_server_sake.c \
 	eap_sake_common.c
 .endif
 
 .include "../Makefile.crypto"
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index e2a9438e1de2..eda50e222d2e 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -1,20 +1,19 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
-.PATH.c:${HOSTAPD_DISTDIR} \
-	${WPA_DISTDIR}/src/utils
+.PATH.c:${HOSTAPD_DISTDIR}
 
 PACKAGE=	hostapd
 PROG=	hostapd_cli
 SRCS=	cli.c common.c edit.c eloop.c hostapd_cli.c os_unix.c \
 	wpa_ctrl.c wpa_debug.c
 
 CFLAGS+= -DCONFIG_CTRL_IFACE
 CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 
 LIBADD+=	util
 
 MAN=	hostapd_cli.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index bf7a496db3a8..504b0883f52f 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -1,47 +1,42 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .include "../Makefile.inc"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/wpa_supplicant \
 	${WPA_DISTDIR}/src/eap_peer \
-	${WPA_DISTDIR}/src/utils \
 	${WPA_DISTDIR}/src/drivers
 
 PACKAGE=	wpa
 PROG=	wpa_cli
-SRCS=	base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c config.c \
+SRCS=	base64.c bitfield.c blacklist.c bss.c cli.c common.c config.c \
 	config_file.c \
 	ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
 	drivers.c driver_common.c \
 	eap_register.c \
 	edit.c eloop.c events.c hw_features_common.c \
 	ieee802_11_common.c l2_packet_freebsd.c notify.c \
 	op_classes.c \
-	os_unix.c robust_av.c rrm.c scan.c wmm_ac.c \
+	os_unix.c rrm.c scan.c wmm_ac.c \
 	wpa.c wpa_cli.c \
 	wpa_ctrl.c wpa_common.c \
 	wpa_debug.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c
 
 MAN=	wpa_cli.8
 
 CFLAGS+= -DCONFIG_CTRL_IFACE
 CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 CFLAGS+= -DCONFIG_TLS=openssl
 # enable use of d_type to identify unix domain sockets
 CFLAGS+= -D_DIRENT_HAVE_D_TYPE
 
 CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y
 LIBADD+=	pcap util
 
 TLS_FUNCS=y
 
-OBJS+=	utils_config.o
-utils_config.o:	${WPA_DISTDIR}/src/utils/config.c
-	${CC} -c ${CFLAGS} -o ${.OBJDIR}/utils_config.o ${WPA_DISTDIR}/src/utils/config.c
-
 .include "../Makefile.crypto"
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile
index 877b73829bf2..9a929c07b6fc 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile
@@ -1,19 +1,18 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
-.PATH.c:${WPA_SUPPLICANT_DISTDIR} \
-	${WPA_DISTDIR}/src/utils
+.PATH.c:${WPA_SUPPLICANT_DISTDIR}
 
 PACKAGE=	wpa
 PROG=	wpa_passphrase
 SRCS=	common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c \
 	sha1.c wpa_passphrase.c
 
 CFLAGS+= -DCONFIG_CRYPTO_INTERNAL -DINTERNAL_SHA1 -DINTERNAL_MD5
 
 LIBADD+=	util
 
 MAN=	wpa_passphrase.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile
index 05d8f743f8f2..9fd4e3ca98a0 100644
--- a/usr.sbin/wpa/wpa_priv/Makefile
+++ b/usr.sbin/wpa/wpa_priv/Makefile
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
-	${WPA_DISTDIR}/src/utils \
 	${WPA_DISTDIR}/src/drivers
 
 PACKAGE=	wpa
 PROG=	wpa_priv
 SRCS=	drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \
 	driver_common.c l2_packet_freebsd.c
 
 LIBADD=	pcap
 
 .include "../Makefile.crypto"
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 6a80ce33a956..352e13e6bde6 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,169 +1,162 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .include "../Makefile.inc"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/src/eap_peer \
-	${WPA_DISTDIR}/src/utils \
 	${WPA_DISTDIR}/src/drivers
 
 PACKAGE=	wpa
 PROG=	wpa_supplicant
 
-SRCS=	base64.c bitfield.c bss.c bssid_ignore.c cli.c common.c \
+SRCS=	base64.c bitfield.c blacklist.c bss.c cli.c common.c \
 	config.c config_file.c \
 	ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
 	driver_bsd.c driver_common.c \
 	driver_wired.c driver_wired_common.c drivers.c \
 	eap_register.c eloop.c \
 	events.c gas.c gas_query.c \
 	http_client.c http_server.c \
 	httpread.c hw_features_common.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 \
-	robust_av.c \
-	rrm.c scan.c twt.c upnp_xml.c \
+	notify.c offchannel.c op_classes.c os_unix.c pmksa_cache.c preauth.c \
+	rrm.c scan.c upnp_xml.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
 
 MAN=	wpa_supplicant.8 wpa_supplicant.conf.5
 
 .if ${MK_EXAMPLES} != "no"
 FILESDIR= ${SHAREDIR}/examples/etc
 .PATH:	${WPA_SUPPLICANT_DISTDIR}
 FILES=	wpa_supplicant.conf
 .endif
 
 CFLAGS+=-DCONFIG_BACKEND_FILE \
 	-DCONFIG_DEBUG_SYSLOG \
 	-DCONFIG_DRIVER_BSD \
 	-DCONFIG_DRIVER_WIRED \
 	-DCONFIG_GAS \
 	-DCONFIG_IEEE80211R \
 	-DCONFIG_IEEE80211N \
 	-DCONFIG_IEEE80211W \
 	-DCONFIG_IEEE80211AC \
 	-DCONFIG_IEEE80211AX \
 	-DCONFIG_PEERKEY \
 	-DCONFIG_PRIVSEP \
 	-DCONFIG_SMARTCARD \
 	-DCONFIG_TERMINATE_ONLASTIF \
 	-DCONFIG_TLS=openssl \
 	-DCONFIG_WPS2 \
 	-DCONFIG_WPS_UPNP \
 	-DPKCS12_FUNCS \
 	-DCONFIG_MATCH_IFACE
 #CFLAGS+= -g
 LIBADD=	pcap util
 
 # User customizations to the wpa_supplicant build environment
 CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
 #DPADD+=${WPA_SUPPLICANT_DPADD}
 LDADD+=${WPA_SUPPLICANT_LDADD}
 #LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}
 
 .if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
 CFLAGS+=-DCONFIG_WPS \
 	-DCONFIG_HS20 \
 	-DCONFIG_INTERWORKING \
 	-DEAP_GTC \
 	-DEAP_LEAP \
 	-DEAP_MD5 \
 	-DEAP_MSCHAPv2 \
 	-DEAP_OTP \
 	-DEAP_PEAP \
 	-DEAP_PSK \
 	-DEAP_TLS \
 	-DEAP_TTLS \
 	-DEAP_WSC \
 	-DIEEE8021X_EAPOL
 SRCS+=	chap.c \
 	eap.c \
 	eap_common.c \
 	eap_gtc.c \
 	eap_leap.c \
 	eap_md5.c \
 	eap_methods.c \
 	eap_mschapv2.c \
 	eap_otp.c \
 	eap_peap.c \
 	eap_peap_common.c \
 	eap_psk.c \
 	eap_psk_common.c \
 	eap_tls.c \
 	eap_tls_common.c \
 	eap_ttls.c \
 	eap_wsc.c \
 	eapol_supp_sm.c \
 	eap_wsc_common.c \
 	hs20_supplicant.c \
 	interworking.c \
 	ms_funcs.c \
 	mschapv2.c \
 	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_ENCBLOCK=y
 NEED_AES_OMAC1=y
 .endif
 TLS_FUNCS=y
 
 .if !empty(CFLAGS:M*-DEAP_AKA)
 SRCS+=	eap_aka.c
 NEED_SIM_COMMON=y
 NEED_AES_CBC=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SIM)
 SRCS+=	eap_sim.c
 NEED_SIM_COMMON=y
 NEED_AES_CBC=y
 .endif
 
 .if defined(NEED_SIM_COMMON)
 SRCS+=	eap_sim_common.c
 NEED_FIPS186_2_PRF=y
 .endif
 
 # PC/SC interface for smartcards (USIM, GSM SIM)
 # GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA)
 # NB: requires devel/pcsc-lite
 #
 # WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC
 # WPA_SUPPLICANT_LDADD=-L/usr/local/lib
 #
 .if !empty(CFLAGS:M*-DPCSC_FUNCS)
 SRCS+=	pcsc_funcs.c
 LIBADD+=	pcslite pthread
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_GPSK)
 CFLAGS+=-DEAP_GPSK_SHA256
 SRCS+=	eap_gpsk.c \
 	eap_gpsk_common.c
 NEED_AES_OMAC1=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_PAX)
 SRCS+=	eap_pax.c \
 	eap_pax_common.c
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SAKE)
 SRCS+=	eap_sake.c \
 	eap_sake_common.c
 .endif
 
-OBJS+=	utils_config.o
-utils_config.o:	${WPA_DISTDIR}/src/utils/config.c
-	${CC} -c ${CFLAGS} -o ${.OBJDIR}/utils_config.o ${WPA_DISTDIR}/src/utils/config.c
-
 .include "../Makefile.crypto"
 
 .include <bsd.prog.mk>