Add API for setting the PMK to the driver. For FT support, allow setting also the PMK-R0 Name. This can be used by drivers that support 4-Way handshake offload while IEEE802.1X authentication is managed by upper layers.
Showing the changes to include/uapi/linux (1 of 7 files). Show all
Unified · Split
| @@ -182,6 +182,17 @@ · 181 unmodified lines | ||
| 182 | 182 | * this offload may reject the %NL80211_CMD_CONNECT when no preshared |
| 183 | 183 | * key material is provided, for example when that driver does not |
| 184 | 184 | * support setting the temporal keys through %CMD_NEW_KEY. |
| 185 | + * | |
| 186 | + * Similarly @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X flag can be | |
| 187 | + * set by drivers indicating offload support of the PTK/GTK EAPOL | |
| 188 | + * handshakes during 802.1X authentication. In order to use the offload | |
| 189 | + * the %NL80211_CMD_CONNECT should have %NL80211_ATTR_WANT_1X_4WAY_HS | |
| 190 | + * attribute flag. Drivers supporting this offload may reject the | |
| 191 | + * %NL80211_CMD_CONNECT when the attribute flag is not present. | |
| 192 | + * | |
| 193 | + * For 802.1X the PMK or PMK-R0 are set by providing %NL80211_ATTR_PMK | |
| 194 | + * using %NL80211_CMD_SET_PMK. For offloaded FT support also | |
| 195 | + * %NL80211_ATTR_PMKR0_NAME must be provided. | |
| 185 | 196 | */ |
| 186 | 197 | |
| 187 | 198 | /** |
| @@ -959,6 +970,14 @@ · 771 unmodified lines | ||
| 959 | 970 | * does not result in a change for the current association. Currently, |
| 960 | 971 | * only the %NL80211_ATTR_IE data is used and updated with this command. |
| 961 | 972 | * |
| 973 | + * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0 | |
| 974 | + * for the given authenticator address (specified with &NL80211_ATTR_MAC). | |
| 975 | + * When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the | |
| 976 | + * PMK-R0, otherwise it specifies the PMK. | |
| 977 | + * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously | |
| 978 | + * configured PMK for the authenticator address identified by | |
| 979 | + * &NL80211_ATTR_MAC. | |
| 980 | + * | |
| 962 | 981 | * @NL80211_CMD_MAX: highest used command number |
| 963 | 982 | * @__NL80211_CMD_AFTER_LAST: internal use |
| 964 | 983 | */ |
| @@ -1158,6 +1177,9 @@ enum nl80211_commands { · 193 unmodified lines | ||
| 1158 | 1177 | |
| 1159 | 1178 | NL80211_CMD_UPDATE_CONNECT_PARAMS, |
| 1160 | 1179 | |
| 1180 | + NL80211_CMD_SET_PMK, | |
| 1181 | + NL80211_CMD_DEL_PMK, | |
| 1182 | + | |
| 1161 | 1183 | /* add new commands above here */ |
| 1162 | 1184 | |
| 1163 | 1185 | /* used to define NL80211_CMD_MAX below */ |
| @@ -2095,13 +2117,20 @@ enum nl80211_commands { · 931 unmodified lines | ||
| 2095 | 2117 | * @NL80211_ATTR_PMK: attribute for passing PMK key material. Used with |
| 2096 | 2118 | * %NL80211_CMD_SET_PMKSA for the PMKSA identified by %NL80211_ATTR_PMKID. |
| 2097 | 2119 | * For %NL80211_CMD_CONNECT it is used to provide PSK for offloading 4-way |
| 2098 | − * handshake for WPA/WPA2-PSK networks. | |
| 2120 | + * handshake for WPA/WPA2-PSK networks. For 802.1X authentication it is | |
| 2121 | + * used with %NL80211_CMD_SET_PMK. For offloaded FT support this attribute | |
| 2122 | + * specifies the PMK-R0 if NL80211_ATTR_PMKR0_NAME is included as well. | |
| 2099 | 2123 | * |
| 2100 | 2124 | * @NL80211_ATTR_SCHED_SCAN_MULTI: flag attribute which user-space shall use to |
| 2101 | 2125 | * indicate that it supports multiple active scheduled scan requests. |
| 2102 | 2126 | * @NL80211_ATTR_SCHED_SCAN_MAX_REQS: indicates maximum number of scheduled |
| 2103 | 2127 | * scan request that may be active for the device (u32). |
| 2104 | 2128 | * |
| 2129 | + * @NL80211_ATTR_WANT_1X_4WAY_HS: flag attribute which user-space can include | |
| 2130 | + * in %NL80211_CMD_CONNECT to indicate that for 802.1X authentication it | |
| 2131 | + * wants to use the supported offload of the 4-way handshake. | |
| 2132 | + * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT. | |
| 2133 | + * | |
| 2105 | 2134 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 2106 | 2135 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 2107 | 2136 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| @@ -2524,6 +2553,9 @@ enum nl80211_attrs { · 416 unmodified lines | ||
| 2524 | 2553 | NL80211_ATTR_SCHED_SCAN_MULTI, |
| 2525 | 2554 | NL80211_ATTR_SCHED_SCAN_MAX_REQS, |
| 2526 | 2555 | |
| 2556 | + NL80211_ATTR_WANT_1X_4WAY_HS, | |
| 2557 | + NL80211_ATTR_PMKR0_NAME, | |
| 2558 | + | |
| 2527 | 2559 | /* add attributes here, update the policy in nl80211.c */ |
| 2528 | 2560 | |
| 2529 | 2561 | __NL80211_ATTR_AFTER_LAST, |
| @@ -4869,6 +4901,10 @@ enum nl80211_feature_flags { · 2339 unmodified lines | ||
| 4869 | 4901 | * @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK: Device wants to do 4-way |
| 4870 | 4902 | * handshake with PSK in station mode (PSK is passed as part of the connect |
| 4871 | 4903 | * and associate commands), doing it in the host might not be supported. |
| 4904 | + * @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X: Device wants to do doing 4-way | |
| 4905 | + * handshake with 802.1X in station mode (will pass EAP frames to the host | |
| 4906 | + * and accept the set_pmk/del_pmk commands), doing it in the host might not | |
| 4907 | + * be supported. | |
| 4872 | 4908 | * |
| 4873 | 4909 | * @NUM_NL80211_EXT_FEATURES: number of extended features. |
| 4874 | 4910 | * @MAX_NL80211_EXT_FEATURES: highest extended feature index. |
| @@ -4890,6 +4926,7 @@ enum nl80211_ext_feature_index { · 15 unmodified lines | ||
| 4890 | 4926 | NL80211_EXT_FEATURE_CQM_RSSI_LIST, |
| 4891 | 4927 | NL80211_EXT_FEATURE_FILS_SK_OFFLOAD, |
| 4892 | 4928 | NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK, |
| 4929 | + NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X, | |
| 4893 | 4930 | |
| 4894 | 4931 | /* add new features before the definition below */ |
| 4895 | 4932 | NUM_NL80211_EXT_FEATURES, |