From nobody Mon Nov 22 18:20:10 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 39BD718A0314; Mon, 22 Nov 2021 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HybCw3Skfz3HTV; Mon, 22 Nov 2021 18:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83F0A271EF; Mon, 22 Nov 2021 18:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AMIKAsN002334; Mon, 22 Nov 2021 18:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMIKArV002332; Mon, 22 Nov 2021 18:20:10 GMT (envelope-from git) Date: Mon, 22 Nov 2021 18:20:10 GMT Message-Id: <202111221820.1AMIKArV002332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d90f00d7ee70 - stable/12 - wpa: Fix WITHOUT_WPA_SUPPLICANT_EAPOL build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d90f00d7ee70e88384154730cf7d1e5921235de9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d90f00d7ee70e88384154730cf7d1e5921235de9 commit d90f00d7ee70e88384154730cf7d1e5921235de9 Author: Cy Schubert AuthorDate: 2021-11-10 03:05:03 +0000 Commit: Cy Schubert CommitDate: 2021-11-22 18:19:32 +0000 wpa: Fix WITHOUT_WPA_SUPPLICANT_EAPOL build Reported by: FreeBSD Build Option Survey https://callfortesting.org/results/bos-2021-11-04/ Fixes: c1d255d3ffdbe447de3ab875bf4e7d7accc5bfc5 (cherry picked from commit c9516b83c14f2dcec57bd175e418c152a0cec947) --- usr.sbin/wpa/Makefile.inc | 12 ++++++------ usr.sbin/wpa/src/ap/Makefile | 9 ++++++--- usr.sbin/wpa/src/crypto/Makefile | 2 -- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index 71ec3f8510d1..cee89dfc4a82 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -40,11 +40,6 @@ CFLAGS+=-DCONFIG_IEEE80211R CFLAGS+=-DCONFIG_IEEE80211W 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 @@ -82,7 +77,12 @@ CFLAGS+=-DCONFIG_HS20 \ -DEAP_TLS \ -DEAP_TTLS \ -DEAP_WSC \ - -DIEEE8021X_EAPOL + -DIEEE8021X_EAPOL \ + -DCONFIG_INTERWORKING \ + -DCONFIG_WPS \ + -DCONFIG_WPS2 \ + -DCONFIG_WPS_UPNP \ + -DCONFIG_WPS_OOB NEED_AES_EAX=y NEED_AES_ENCBLOCK=y NEED_AES_OMAC1=y diff --git a/usr.sbin/wpa/src/ap/Makefile b/usr.sbin/wpa/src/ap/Makefile index 162b8b5444aa..801f45fca8a6 100644 --- a/usr.sbin/wpa/src/ap/Makefile +++ b/usr.sbin/wpa/src/ap/Makefile @@ -20,9 +20,7 @@ SRCS= accounting.c \ dfs.c \ drv_callbacks.c \ eap_user_db.c \ - gas_serv.c \ hostapd.c \ - hs20.c \ ieee802_11_auth.c \ ieee802_11_ht.c \ ieee802_11_shared.c \ @@ -43,8 +41,13 @@ SRCS= accounting.c \ wnm_ap.c \ wpa_auth.c \ wpa_auth_glue.c \ - wpa_auth_ie.c \ + wpa_auth_ie.c + +.if ${MK_WPA_SUPPLICANT_EAPOL} != "no" +SRCS+= gas_serv.c \ + hs20.c \ wps_hostapd.c +.endif CFLAGS+=-DHOSTAPD diff --git a/usr.sbin/wpa/src/crypto/Makefile b/usr.sbin/wpa/src/crypto/Makefile index eede671aa7db..d71b740bb816 100644 --- a/usr.sbin/wpa/src/crypto/Makefile +++ b/usr.sbin/wpa/src/crypto/Makefile @@ -138,9 +138,7 @@ SRCS+= dh_group5.c SRCS+= dh_groups.c .endif -.if ${MK_WPA_SUPPLICANT_EAPOL} != "no" SRCS+= ms_funcs.c -.endif CFLAGS+=-DCONFIG_CRYPTO_INTERNAL \ -DCONFIG_TLS_INTERNAL_CLIENT \