Re: git: 995f5b9b0e4d - main - net/nhostapd*, security/wpa_supplicant*: Sync drivers_bsd.c from src
Date: Mon, 17 Mar 2025 13:45:36 UTC
In message <Z9cJqOxzuRu_eo_C@graf.pompo.net>, Thierry Thomas writes: > > > --o1JDKDJeTmX7daQl > Content-Type: text/plain; charset=iso-8859-1 > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > Le sam. 15 mars 25 =E0 23:44:26 +0100, Cy Schubert <cy@FreeBSD.org> > =E9crivait=A0: > > > The branch main has been updated by cy: > >=20 > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D995f5b9b0e4dc582efaf9fb9= > 61125af852cb3a57 > >=20 > > commit 995f5b9b0e4dc582efaf9fb961125af852cb3a57 > > Author: Cy Schubert <cy@FreeBSD.org> > > AuthorDate: 2025-03-13 20:46:17 +0000 > > Commit: Cy Schubert <cy@FreeBSD.org> > > CommitDate: 2025-03-15 22:43:27 +0000 > >=20 > > net/nhostapd*, security/wpa_supplicant*: Sync drivers_bsd.c from src > > =20 > > src/ commits to drviers_bsd.c in src have fixed a number of problems > > with wpa_supplicant/hostapd and FreeBSD. Bring those changes into the > > ports. > > =20 > > PR: 285371 > > Tested by: Matthias Apitz <guru@unixarea.de> > > MFH 2025Q1 > > On 14.2-STABLE security/wpa_supplicant with the default options fails: > > cc -c -o /usr/ports/security/wpa_supplicant/work/wpa_supplicant-2.11/build/= > wpa_supplicant/src/drivers/driver_bsd.o -O2 -pipe -I/usr/local/include -I/= > usr/include -Wno-deprecated-declarations -fstack-protector-strong -fno-stri= > ct-aliasing -I/usr/ports/security/wpa_supplicant/work/wpa_supplicant-2.11= > /src -I/usr/ports/security/wpa_supplicant/work/wpa_supplicant-2.11/src/util= > s -DCONFIG_BACKEND_FILE -DCONFIG_IEEE80211R -DCONFIG_MATCH_IFACE -DCONFIG_P= > ASN -DCONFIG_PTKSA_CACHE -DCONFIG_HS20 -DCONFIG_INTERWORKING -DCONFIG_DRIVE= > R_WIRED -DCONFIG_DRIVER_BSD -DEAP_TLS -DEAP_PEAP -DEAP_TTLS -DEAP_MD5 -DEAP= > _MSCHAPv2 -DEAP_GTC -DEAP_OTP -DEAP_LEAP -DEAP_PSK -DEAP_FAST -DEAP_PAX -DE= > AP_SAKE -DEAP_GPSK -DEAP_GPSK_SHA256 -DEAP_PWD -DEAP_EKE -DCONFIG_WPS -DEAP= > _WSC -DCONFIG_WPS_NFC -DCONFIG_WPS_OOB -DCONFIG_WPS_ER -DCONFIG_WPS_UPNP -D= > EAP_IKEV2 -DEAP_TNC -DIEEE8021X_EAPOL -DPKCS12_FUNCS -DCONFIG_SMARTCARD -DC= > RYPTO_RSA_OAEP_SHA256 -DEAP_TLS_OPENSSL -DTLS_DEFAULT_CIPHERS=3D\""DEFAULT:= > !EXP:!LOW"\" -DCONFIG_DES -DCONFIG_SHA256 -DCONFIG_HMAC_SHA256_KDF -DCONFIG= > _HMAC_SHA384_KDF -DCONFIG_SHA384 -DALL_DH_GROUPS -DCONFIG_ECC -DCONFIG_CTRL= > _IFACE -DCONFIG_CTRL_IFACE_UNIX -DCONFIG_CTRL_IFACE_DBUS_NEW -DCONFIG_CTRL_= > IFACE_DBUS_INTRO -I/usr/local/libdata/pkgconfig/../../include/dbus-1.0 -I/u= > sr/local/libdata/pkgconfig/../../lib/dbus-1.0/include -DCONFIG_DEBUG_SYSLOG= > -DCONFIG_GAS -DCONFIG_OFFCHANNEL ../src/drivers/driver_bsd.c > =2E./src/drivers/driver_bsd.c:382:16: error: use of undeclared identifier '= > IEEE80211_CIPHER_AES_GCM_128' > 382 | wk.ik_type =3D IEEE80211_CIPHER_AES_GCM_128; > | ^ > =2E./src/drivers/driver_bsd.c:385:16: error: use of undeclared identifier '= > IEEE80211_CIPHER_BIP_CMAC_128' > 385 | wk.ik_type =3D IEEE80211_CIPHER_BIP_CMAC_128; > | ^ > =2E./src/drivers/driver_bsd.c:1587:30: error: use of undeclared identifier = > 'IEEE80211_CRYPTO_AES_GCM_128' > 1587 | if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_GCM_128) > | ^ > =2E./src/drivers/driver_bsd.c:1589:30: error: use of undeclared identifier = > 'IEEE80211_CRYPTO_BIP_CMAC_128' > 1589 | if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_BIP_CMAC_128) > | ^ > 4 errors generated. > gmake: *** [../src/build.rules:86: /usr/ports/security/wpa_supplicant/work/= > wpa_supplicant-2.11/build/wpa_supplicant/src/drivers/driver_bsd.o] Error 1 > *** Error code 1 > > --=20 > Th. Thomas. Sorry about this. I had forgotten that bz@ had added GMAC 128 support. It is fixed now. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0