Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Nov 2021 18:20:08 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 6aa78e230fa9 - stable/12 - Revert "wpa: Fix WITHOUT_CRYPT build"
Message-ID:  <202111221820.1AMIK8dM001905@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=6aa78e230fa953f99e3defb9a7f956ef80794da7

commit 6aa78e230fa953f99e3defb9a7f956ef80794da7
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-11-09 22:17:01 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-11-22 18:19:32 +0000

    Revert "wpa: Fix WITHOUT_CRYPT build"
    
    This reverts commit a30e8044aa4753858c189f3384dae2b2f25a150b.
    WITHOUT_OPENSSL build is a subset of WITHOUT_CRYPT build. It was
    incorrect to label this patch as fixing WITHOUT_CRYPT when in fact
    it fixes WITHOUT_OPENSSL. The build failure will be addressed in a
    fix for WITHOUT_OPENSSL build.
    
    (cherry picked from commit 96e2ac9c48baae6a352eb5574af87f81e01ff021)
---
 usr.sbin/wpa/Makefile.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index 013973dde14e..e9a2053c6095 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -54,6 +54,7 @@ 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
@@ -88,10 +89,6 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111221820.1AMIK8dM001905>