Page MenuHomeFreeBSD
Files F113036158

D49418.diff
No OneTemporary
Actions

D49418.diff
View Options

diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c
--- a/contrib/wpa/src/drivers/driver_bsd.c
+++ b/contrib/wpa/src/drivers/driver_bsd.c
@@ -378,9 +378,15 @@
case WPA_ALG_CCMP:
wk.ik_type = IEEE80211_CIPHER_AES_CCM;
break;
+ case WPA_ALG_CCMP_256:
+ wk.ik_type = IEEE80211_CIPHER_AES_CCM_256;
+ break;
case WPA_ALG_GCMP:
wk.ik_type = IEEE80211_CIPHER_AES_GCM_128;
break;
+ case WPA_ALG_GCMP_256:
+ wk.ik_type = IEEE80211_CIPHER_AES_GCM_256;
+ break;
case WPA_ALG_BIP_CMAC_128:
wk.ik_type = IEEE80211_CIPHER_BIP_CMAC_128;
break;
@@ -448,16 +454,24 @@
{
#ifndef IEEE80211_IOC_APPIE
static const char *ciphernames[] =
- { "WEP", "TKIP", "AES-OCB", "AES-CCM", "CKIP", "NONE" };
+ { "WEP", "TKIP", "AES-OCB", "AES-CCM", "CKIP", "NONE",
+ "AES-CCM-256", "BIP-CMAC-128", "BIP-CMAC-256", "BIP-GMAC-128",
+ "BIP-GMAC-256", "AES-GCM-128", "AES-GCM-256" };
int v;
switch (params->wpa_group) {
case WPA_CIPHER_CCMP:
v = IEEE80211_CIPHER_AES_CCM;
break;
+ case WPA_CIPHER_CCMP_256:
+ v = IEEE80211_CIPHER_AES_CCM_256;
+ break;
case WPA_CIPHER_GCMP:
v = IEEE80211_CIPHER_AES_GCM_128;
break;
+ case WPA_CIPHER_GCMP_256:
+ v = IEEE80211_CIPHER_AES_GCM_256;
+ break;
case WPA_CIPHER_BIP_CMAC_128:
v = IEEE80211_CIPHER_BIP_CMAC_128;
break;
@@ -501,8 +515,12 @@
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_GCMP_256)
+ v |= 1<<IEEE80211_CIPHER_AES_GCM_256;
if (params->wpa_pairwise & WPA_CIPHER_CCMP)
v |= 1<<IEEE80211_CIPHER_AES_CCM;
+ if (params->wpa_pairwise & WPA_CIPHER_CCMP_256)
+ v |= 1<<IEEE80211_CIPHER_AES_CCM_256;
if (params->wpa_pairwise & WPA_CIPHER_TKIP)
v |= 1<<IEEE80211_CIPHER_TKIP;
if (params->wpa_pairwise & WPA_CIPHER_NONE)
@@ -1584,8 +1602,12 @@
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_CCM_256)
+ drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP_256;
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_GCM_128)
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_GCMP;
+ if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_AES_GCM_256)
+ drv->capa.enc |= WPA_DRIVER_CAPA_ENC_GCMP_256;
if (devcaps.dc_cryptocaps & IEEE80211_CRYPTO_BIP_CMAC_128)
drv->capa.enc |= WPA_DRIVER_CAPA_ENC_BIP;

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 5:01 PM (11 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17238485
Default Alt Text
D49418.diff (2 KB)

Event Timeline