Re: git: ef1134110e80 - stable/13 - wpa: Fix WITHOUT_CRYPT build

In message <CAPyFy2BHZpRqn4WVkfnuL6YOhrSLMjsCqSKjM5_ufPjMK+SUUg@mail.gmail.c
om>
, Ed Maste writes:
> On Thu, 4 Nov 2021 at 14:32, Cy Schubert <cy@freebsd.org> wrote:
> >
> > The branch stable/13 has been updated by cy:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=ef1134110e80fe31792d01758b055a
> 4bbec7de69
> >
> > commit ef1134110e80fe31792d01758b055a4bbec7de69
> > Author:     Cy Schubert <cy@FreeBSD.org>
> > AuthorDate: 2021-10-28 23:55:48 +0000
> > Commit:     Cy Schubert <cy@FreeBSD.org>
> > CommitDate: 2021-11-04 18:30:25 +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
>
> Do we need to guard the build of pasn_supplicant.c by MK_CRYPT as well?
>
> My WITHOUT_CRYPT Cirrus-CI build failed with:
>
> --- pasn_supplicant.o ---
> /tmp/cirrus-ci-build/contrib/wpa//wpa_supplicant/pasn_supplicant.c:588:35:
> error: no member named 'pasn' in 'struct wpa_supplicant'
> struct wpas_pasn *pasn = &wpa_s->pasn;
> ~~~~~ ^

Let me know if this fixes it (as the build failed in tests/ktls).

diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplic
ant/Makefile
index 8e7edfcf7720..fdb9f2594e2d 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -27,7 +27,6 @@ SRCS=	bss.c \
 	notify.c \
 	op_classes.c \
 	offchannel.c \
-	pasn_supplicant.c \
 	robust_av.c \
 	rrm.c \
 	scan.c \
@@ -37,6 +36,10 @@ SRCS=	bss.c \
 	wpa_supplicant.c \
 	wpas_glue.c
 
+.if ${MK_CRYPT} != "no"
+SRCS+=	pasn_supplicant.c
+.endif
+
 MAN=	wpa_supplicant.8 wpa_supplicant.conf.5
 
 .if ${MK_EXAMPLES} != "no"



-- 
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy@nwtime.org>    Web:  https://nwtime.org

	The need of the many outweighs the greed of the few.