From nobody Tue Nov 09 02:30:04 2021 X-Original-To: dev-commits-src-branches@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 C9A631842F53; Tue, 9 Nov 2021 02:30:06 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HpBlf4JYCz4fKc; Tue, 9 Nov 2021 02:30:06 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id kBfGm5t74ps7PkGtimXo4i; Tue, 09 Nov 2021 02:30:06 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id kGtgmgFzW49dpkGthmRiXX; Tue, 09 Nov 2021 02:30:06 +0000 X-Authority-Analysis: v=2.4 cv=RqTWkQqK c=1 sm=1 tr=0 ts=6189dd2e a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=vIxV3rELxO4A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=xbaXX6n7seQtcWxjvTEA:9 a=CjuIK1q_8ugA:10 a=vRcdKC0ogzYA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 452FE725; Mon, 8 Nov 2021 18:30:04 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 1A92U4Xj008873; Mon, 8 Nov 2021 18:30:04 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202111090230.1A92U4Xj008873@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ed Maste cc: Cy Schubert , src-committers , "" , dev-commits-src-branches@freebsd.org Subject: Re: git: ef1134110e80 - stable/13 - wpa: Fix WITHOUT_CRYPT build In-reply-to: References: <202111041832.1A4IWExb004128@gitrepo.freebsd.org> Comments: In-reply-to Ed Maste message dated "Mon, 08 Nov 2021 14:38:38 -0500." List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 08 Nov 2021 18:30:04 -0800 X-CMAE-Envelope: MS4xfKUIMFZWCvq8fxlEov6LrLhS9zDxekf3YWasttTSV9Kj6E4GLxKwAuFscbaz3M9QYj41FlurcOG+dfVK2WJQ4F+YeYObnrcA3IkmFL09jxereAs5XhAf RIh9T8c8BG+l7hIZnA2budrke3peycmRJh7eDb0t9rFQ5itsKANDxhX11bzIqueE6ZL0UstPW6YXCZxWldcAcGmmAECJAs98c0q5aZCeWenOjtejeXOgqg+Q ubmUuOb6nJY/6cm4uD5AuMBtPYuJrYOriUULko1VOoxUB4386Z8IFzdvam+UT9yPEX5D6B2JGOsrFvv15I8kfLbnPJnQzkjZsl436CDR5nvYO/XHqoJgwTE/ 3gZmcOwV X-Rspamd-Queue-Id: 4HpBlf4JYCz4fKc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N In message , Ed Maste writes: > On Thu, 4 Nov 2021 at 14:32, Cy Schubert 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 > > AuthorDate: 2021-10-28 23:55:48 +0000 > > Commit: Cy Schubert > > 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 FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.