aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-11-16 11:20:51 (GMT)
committerJouni Malinen <j@w1.fi>2014-11-16 11:20:51 (GMT)
commit666497c8e65c3e6981d0c142a442dd7202c5d0b4 (patch)
treee586ec63a69a8ca690f4e82bcad4812fdfd68c4a /hostapd
parenteec0cc8da2286133bb2c53fd695bd26aa2689eed (diff)
downloadhostap-666497c8e65c3e6981d0c142a442dd7202c5d0b4.zip
hostap-666497c8e65c3e6981d0c142a442dd7202c5d0b4.tar.gz
hostap-666497c8e65c3e6981d0c142a442dd7202c5d0b4.tar.bz2
Suite B: Add AKM 00-0F-AC:11
This adds definitions for the 128-bit level Suite B AKM 00-0F-AC:11. The functionality itself is not yet complete, i.e., this commit only includes parts to negotiate the new AKM. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/config_file.c2
-rw-r--r--hostapd/ctrl_iface.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index f98e957..ea7a018 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -680,6 +680,8 @@ static int hostapd_config_parse_key_mgmt(int line, const char *value)
else if (os_strcmp(start, "FT-SAE") == 0)
val |= WPA_KEY_MGMT_FT_SAE;
#endif /* CONFIG_SAE */
+ else if (os_strcmp(start, "WPA-EAP-SUITE-B") == 0)
+ val |= WPA_KEY_MGMT_IEEE8021X_SUITE_B;
else {
wpa_printf(MSG_ERROR, "Line %d: invalid key_mgmt '%s'",
line, start);
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index c045658..162a642 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -977,6 +977,12 @@ static int hostapd_ctrl_iface_get_config(struct hostapd_data *hapd,
pos += ret;
}
#endif /* CONFIG_SAE */
+ if (hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B) {
+ ret = os_snprintf(pos, end - pos, "WPA-EAP-SUITE-B ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
ret = os_snprintf(pos, end - pos, "\n");
if (ret < 0 || ret >= end - pos)