jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

wpa: add support for GCMP-128 and BIP-128.

Browse Source 
If net80211 announces support for GCMP and/or BIP then configure it
appropriately.

GCMP will be used by WPA3 in the future, and BIP is required for
802.11w/MFP (which is also required by WPA3.)

Differential Revision: https://reviews.freebsd.org/D46499
This commit is contained in:
Adrian Chadd 2024-08-31 09:43:22 -07:00
parent 3d0d43d25a
commit 8b51df0d4f
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/wpa/src/drivers/driver_bsd.c
View File

@ -378,6 +378,12 @@ bsd_set_key(void *priv, struct wpa_driver_set_key_params *params)
case WPA_ALG_CCMP:
wk.ik_type = IEEE80211_CIPHER_AES_CCM;
break;
case WPA_ALG_GCMP:
wk.ik_type = IEEE80211_CIPHER_AES_GCM_128;
break;
case WPA_ALG_BIP_CMAC_128:
wk.ik_type = IEEE80211_CIPHER_BIP_CMAC_128;
break;
default:
wpa_printf(MSG_ERROR, "%s: unknown alg=%d", __func__, alg);
return -1;
@ -449,6 +455,12 @@ bsd_configure_wpa(void *priv, struct wpa_bss_params *params)
case WPA_CIPHER_CCMP:
v = IEEE80211_CIPHER_AES_CCM;
break;
case WPA_CIPHER_GCMP:
v = IEEE80211_CIPHER_AES_GCM_128;
break;
case WPA_CIPHER_BIP_CMAC_128:
v = IEEE80211_CIPHER_BIP_CMAC_128;
break;
case WPA_CIPHER_TKIP:
v = IEEE80211_CIPHER_TKIP;
break;
@ -485,6 +497,10 @@ bsd_configure_wpa(void *priv, struct wpa_bss_params *params)
}
v = 0;
if (params->wpa_pairwise & WPA_CIPHER_BIP_CMAC_128)
v |= 1<<IEEE80211_CIPHER_BIP_CMAC_128;
if (params->wpa_pairwise & WPA_CIPHER_GCMP)
v |= 1<<IEEE80211_CIPHER_AES_GCM_128;
if (params->wpa_pairwise & WPA_CIPHER_CCMP)
v |= 1<<IEEE80211_CIPHER_AES_CCM;
if (params->wpa_pairwise & WPA_CIPHER_TKIP)
@ -1567,6 +1583,10 @@ static int wpa_driver_bsd_capa(struct bsd_driver_data *drv)
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_TKIP;
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_CCM)
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP;
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_GCM_128)
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_GCMP;
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_BIP_CMAC_128)
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_BIP;
if (devcaps.dc_drivercaps & IEEE80211_C_HOSTAP)
drv->capa.flags |= WPA_DRIVER_FLAGS_AP;