git: d8b607c5a9a3 - stable/12 - wpa: Fix WITHOUT_CRYPT build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Nov 2021 18:20:06 UTC
The branch stable/12 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=d8b607c5a9a36fbac6ee4e97314869a7f5306832
commit d8b607c5a9a36fbac6ee4e97314869a7f5306832
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-10-28 23:55:48 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-11-22 18:19:31 +0000
wpa: Fix WITHOUT_CRYPT build
PASN requires CRYPT and when built WITHOUT_CRYPT buildworld
fails. Only enable PASN when MK_CRYPT is enabled (default).
PR: 259517
Reported by: emaste
Fixes: c1d255d3ffdbe447de3ab875bf4e7d7accc5bfc5
(cherry picked from commit a30e8044aa4753858c189f3384dae2b2f25a150b)
---
usr.sbin/wpa/Makefile.inc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index e9a2053c6095..013973dde14e 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -54,7 +54,6 @@ 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
@@ -89,6 +88,10 @@ NEED_AES_ENCBLOCK=y
NEED_AES_OMAC1=y
.endif
+.if ${MK_CRYPT} != "no"
+CFLAGS+=-DCONFIG_PASN
+.endif
+
.if !empty(CFLAGS:M*-DEAP_AKA)
NEED_SIM_COMMON=y
NEED_AES_CBC=y