wpa: Import wpa_supplicant/hostapd commits up to b4f7506ff

Merge vendor commits 40c7ff83e74eabba5a7e2caefeea12372b2d3f9a,
efec8223892b3e677acb46eae84ec3534989971f, and
2f6c3ea9600b494d24cac5a38c1cea0ac192245e.

Tested by:	philip
MFC after:	2 months

9 files changed, 19 insertions, 19 deletions

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
@@ -3,6 +3,7 @@
 .if ${MK_OPENSSL} != "no"
 LIBADD+=	ssl crypto
 CFLAGS+= -DCONFIG_SHA256
+CFLAGS+= -DCONFIG_ECC
 .else
 CFLAGS+=-DCONFIG_CRYPTO_INTERNAL
 CONFIG_INTERNAL_AES=y
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
@@ -40,8 +40,6 @@ 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
@@ -54,9 +52,12 @@ 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
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
@@ -26,8 +26,6 @@ FILES=	hostapd.conf hostapd.eap_user hostapd.wpa_psk
 
 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
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
@@ -12,7 +12,6 @@ INTERNALLIB=
 SRCS=	accounting.c \
 	ap_config.c \
 	ap_drv_ops.c \
-	ap_list.c \
 	ap_mlme.c \
 	authsrv.c \
 	beacon.c \
@@ -24,15 +23,11 @@ SRCS=	accounting.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 \
@@ -49,9 +44,7 @@ SRCS=	accounting.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=
diff --git a/usr.sbin/wpa/src/common/Makefile b/usr.sbin/wpa/src/common/Makefile
index b415b926c207..ed27c3eb6bf4 100644
--- a/usr.sbin/wpa/src/common/Makefile
+++ b/usr.sbin/wpa/src/common/Makefile
@@ -11,9 +11,12 @@ INTERNALLIB=
 
 SRCS=	cli.c \
 	ctrl_iface_common.c \
+	dragonfly.c \
+	dpp_tcp.c \
 	gas.c \
 	hw_features_common.c \
 	ieee802_11_common.c \
+	ptksa_cache.c \
 	wpa_common.c \
 	wpa_ctrl.c
 
diff --git a/usr.sbin/wpa/src/crypto/Makefile b/usr.sbin/wpa/src/crypto/Makefile
index b25489072425..c95834279c21 100644
--- a/usr.sbin/wpa/src/crypto/Makefile
+++ b/usr.sbin/wpa/src/crypto/Makefile
@@ -15,6 +15,8 @@ SRCS=	crypto_openssl.c \
 	sha1-prf.c \
 	sha256-prf.c \
 	sha256-tlsprf.c \
+	sha384-prf.c \
+	sha384-tlsprf.c \
 	sha512.c
 .else
 SRCS=	crypto_internal.c \
@@ -109,7 +111,8 @@ SRCS+=	sha256-internal.c \
 SRCS+=	sha384.c
 .if defined(CONFIG_INTERNAL_SHA384)
 SRCS+=	sha384-internal.c \
-	sha384-prf.c
+	sha384-prf.c \
+	sha384-tlsprf.c
 .endif
 .endif
 
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
@@ -16,10 +16,6 @@ SRCS=	pmksa_cache.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=
 
diff --git a/usr.sbin/wpa/src/utils/Makefile b/usr.sbin/wpa/src/utils/Makefile
index 22ec732a2b3b..061ddeaad6f8 100644
--- a/usr.sbin/wpa/src/utils/Makefile
+++ b/usr.sbin/wpa/src/utils/Makefile
@@ -11,7 +11,9 @@ INTERNALLIB=
 
 SRCS=	base64.c \
 	bitfield.c \
+	crc32.c \
 	common.c \
+	config.c \
 	edit.c \
 	eloop.c \
 	ip_addr.c \
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 27bf83d29f7e..b437d2991360 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -12,8 +12,8 @@
 PACKAGE=	wpa
 PROG=	wpa_supplicant
 
-SRCS=	blacklist.c \
-	bss.c \
+SRCS=	bss.c \
+	bssid_ignore.c \
 	config.c \
 	config_file.c \
 	ctrl_iface.c \
@@ -26,8 +26,11 @@ SRCS=	blacklist.c \
 	notify.c \
 	op_classes.c \
 	offchannel.c \
+	pasn_supplicant.c \
+	robust_av.c \
 	rrm.c \
 	scan.c \
+	twt.c \
 	wmm_ac.c \
 	wpa_supplicant.c \
 	wpas_glue.c