History

cfg80211: support bigger kek/kck key length

With some newer AKMs, the KCK and KEK are bigger, so allow that if the driver advertises support for it. In addition, add a new attribute for the AKM so we can use it for offloaded rekeying.

Nathan Errera committed 6 years ago

Commit 093a48d1 parent 07c12d63 files · +32 −7Browse files

Showing the changes to include/uapi/linux (1 of 3 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+4−0
@@ -5396,6 +5396,8 @@ enum plink_actions { · 5395 unmodified lines
5396 5396
5397#define NL80211_KCK_LEN 165397#define NL80211_KCK_LEN 16
5398#define NL80211_KEK_LEN 165398#define NL80211_KEK_LEN 16
5399#define NL80211_KCK_EXT_LEN 24
5400#define NL80211_KEK_EXT_LEN 32
5399#define NL80211_REPLAY_CTR_LEN 85401#define NL80211_REPLAY_CTR_LEN 8
5400 5402
5401/**5403/**
@@ -5404,6 +5406,7 @@ enum plink_actions { · 2 unmodified lines
5404 * @NL80211_REKEY_DATA_KEK: key encryption key (binary)5406 * @NL80211_REKEY_DATA_KEK: key encryption key (binary)
5405 * @NL80211_REKEY_DATA_KCK: key confirmation key (binary)5407 * @NL80211_REKEY_DATA_KCK: key confirmation key (binary)
5406 * @NL80211_REKEY_DATA_REPLAY_CTR: replay counter (binary)5408 * @NL80211_REKEY_DATA_REPLAY_CTR: replay counter (binary)
5409 * @NL80211_REKEY_DATA_AKM: AKM data (OUI, suite type)
5407 * @NUM_NL80211_REKEY_DATA: number of rekey attributes (internal)5410 * @NUM_NL80211_REKEY_DATA: number of rekey attributes (internal)
5408 * @MAX_NL80211_REKEY_DATA: highest rekey attribute (internal)5411 * @MAX_NL80211_REKEY_DATA: highest rekey attribute (internal)
5409 */5412 */
@@ -5412,6 +5415,7 @@ enum nl80211_rekey_data { · 2 unmodified lines
5412 NL80211_REKEY_DATA_KEK,5415 NL80211_REKEY_DATA_KEK,
5413 NL80211_REKEY_DATA_KCK,5416 NL80211_REKEY_DATA_KCK,
5414 NL80211_REKEY_DATA_REPLAY_CTR,5417 NL80211_REKEY_DATA_REPLAY_CTR,
5418 NL80211_REKEY_DATA_AKM,
5415 5419
5416 /* keep last */5420 /* keep last */
5417 NUM_NL80211_REKEY_DATA,5421 NUM_NL80211_REKEY_DATA,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t