Page MenuHomeFreeBSD
Files F107109734

D44899.id137484.diff
No OneTemporary
Actions

D44899.id137484.diff
View Options

diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.h
@@ -137,8 +137,17 @@
#define IEEE80211_CIPHER_TKIPMIC 4 /* TKIP MIC capability */
#define IEEE80211_CIPHER_CKIP 5
#define IEEE80211_CIPHER_NONE 6 /* pseudo value */
+#define IEEE80211_CIPHER_AES_CCM_256 7
+#define IEEE80211_CIPHER_BIP_CMAC_128 8
+#define IEEE80211_CIPHER_BIP_CMAC_256 9
+#define IEEE80211_CIPHER_BIP_GMAC_128 10
+#define IEEE80211_CIPHER_BIP_GMAC_256 11
+#define IEEE80211_CIPHER_AES_GCM_128 12
+#define IEEE80211_CIPHER_AES_GCM_256 13
-#define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_NONE+1)
+#define IEEE80211_CIPHER_LAST 13
+
+#define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_LAST+1)
/* capability bits in ic_cryptocaps/iv_cryptocaps */
#define IEEE80211_CRYPTO_WEP (1<<IEEE80211_CIPHER_WEP)
@@ -147,9 +156,18 @@
#define IEEE80211_CRYPTO_AES_CCM (1<<IEEE80211_CIPHER_AES_CCM)
#define IEEE80211_CRYPTO_TKIPMIC (1<<IEEE80211_CIPHER_TKIPMIC)
#define IEEE80211_CRYPTO_CKIP (1<<IEEE80211_CIPHER_CKIP)
+#define IEEE80211_CRYPTO_AES_CCM_256 (1<<IEEE80211_CIPHER_AES_CCM_256)
+#define IEEE80211_CRYPTO_BIP_CMAC_128 (1<<IEEE80211_CIPHER_BIP_CMAC_128)
+#define IEEE80211_CRYPTO_BIP_CMAC_256 (1<<IEEE80211_CIPHER_BIP_CMAC_256)
+#define IEEE80211_CRYPTO_BIP_GMAC_128 (1<<IEEE80211_CIPHER_BIP_GMAC_128)
+#define IEEE80211_CRYPTO_BIP_GMAC_256 (1<<IEEE80211_CIPHER_BIP_GMAC_256)
+#define IEEE80211_CRYPTO_AES_GCM_128 (1<<IEEE80211_CIPHER_AES_GCM_128)
+#define IEEE80211_CRYPTO_AES_GCM_256 (1<<IEEE80211_CIPHER_AES_GCM_256)
#define IEEE80211_CRYPTO_BITS \
- "\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP"
+ "\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP\7NONE\10AES_CCM_256" \
+ "\11BIP_CMAC_128\12BIP_CMAC_256\13BIP_GMAC_128\14BIP_CMAC_256" \
+ "\15AES_GCM_128\16AES_GCM_256"
#if defined(__KERNEL__) || defined(_KERNEL)

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 11, 6:24 AM (16 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15751331
Default Alt Text
D44899.id137484.diff (1 KB)

Event Timeline