git: 96e2ac9c48ba - main - Revert "wpa: Fix WITHOUT_CRYPT build"

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Fri, 12 Nov 2021 03:25:07 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=96e2ac9c48baae6a352eb5574af87f81e01ff021

commit 96e2ac9c48baae6a352eb5574af87f81e01ff021
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-11-09 22:17:01 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-11-12 03:03:05 +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.
    
    MFC after:      1 week
---
 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 e43a6f539d92..915b5312f02f 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -56,6 +56,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
@@ -90,10 +91,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