Attachment 227990 Details for Bug 258527 – This should fix it.

[patch] This should fix it.

pr258527-2.diff (text/plain), 3.19 KB, created by Cy Schubert on 2021-09-18 18:51:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2021-09-18 18:51:25 UTC

Size: 3.19 KB

patch

obsolete

>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..99c4c04fb7fe 100644
>--- a/usr.sbin/wpa/src/common/Makefile
>+++ b/usr.sbin/wpa/src/common/Makefile
>@@ -11,6 +11,7 @@ INTERNALLIB=
> 
> SRCS=	cli.c \
> 	ctrl_iface_common.c \
>+	dragonfly.c \
> 	gas.c \
> 	hw_features_common.c \
> 	ieee802_11_common.c \
>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=
>

Actions: View | Diff

Attachments on bug 258527: 227932 | 227964 | 227990