Re: git: 995f5b9b0e4d - main - net/nhostapd*, security/wpa_supplicant*: Sync drivers_bsd.c from src

From: Thierry Thomas <thierry_at_freebsd.org>
Date: Sun, 16 Mar 2025 17:26:00 UTC 
Le sam. 15 mars 25 à 23:44:26 +0100, Cy Schubert <cy@FreeBSD.org>
 écrivait :

> The branch main has been updated by cy:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=995f5b9b0e4dc582efaf9fb961125af852cb3a57
> 
> 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
> 
>     net/nhostapd*, security/wpa_supplicant*: Sync drivers_bsd.c from src
>     
>     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.
>     
>     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-strict-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/utils -DCONFIG_BACKEND_FILE -DCONFIG_IEEE80211R -DCONFIG_MATCH_IFACE -DCONFIG_PASN -DCONFIG_PTKSA_CACHE -DCONFIG_HS20 -DCONFIG_INTERWORKING -DCONFIG_DRIVER_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 -DEAP_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 -DEAP_IKEV2 -DEAP_TNC -DIEEE8021X_EAPOL -DPKCS12_FUNCS -DCONFIG_SMARTCARD -DCRYPTO_RSA_OAEP_SHA256 -DEAP_TLS_OPENSSL -DTLS_DEFAULT_CIPHERS=\""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/usr/local/libdata/pkgconfig/../../lib/dbus-1.0/include -DCONFIG_DEBUG_SYSLOG -DCONFIG_GAS -DCONFIG_OFFCHANNEL ../src/drivers/driver_bsd.c
../src/drivers/driver_bsd.c:382:16: error: use of undeclared identifier 'IEEE80211_CIPHER_AES_GCM_128'
  382 |                 wk.ik_type = IEEE80211_CIPHER_AES_GCM_128;
      |                              ^
../src/drivers/driver_bsd.c:385:16: error: use of undeclared identifier 'IEEE80211_CIPHER_BIP_CMAC_128'
  385 |                 wk.ik_type = IEEE80211_CIPHER_BIP_CMAC_128;
      |                              ^
../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)
      |                                     ^
../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

-- 
Th. Thomas.