aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/ctrl_iface.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-12-24 20:21:04 (GMT)
committerJouni Malinen <j@w1.fi>2013-12-24 20:21:04 (GMT)
commit30675c34166a7491575ddbf6ef82a9aec89e2ff9 (patch)
tree4d68cf9acbcaf816cfe3dc387f3d3cb01318ee77 /wpa_supplicant/ctrl_iface.c
parent13b24a766f9bb295dbc84af3aa513eaf8b2a1972 (diff)
downloadhostap-30675c34166a7491575ddbf6ef82a9aec89e2ff9.zip
hostap-30675c34166a7491575ddbf6ef82a9aec89e2ff9.tar.gz
hostap-30675c34166a7491575ddbf6ef82a9aec89e2ff9.tar.bz2
Add definitions for new cipher suites from IEEE Std 802.11ac-2013
This adds initial parts for supporting the new GCMP-256, CCMP-256, BIP-GMAC-128, BIP-GMAC-256, and BIP-CMAC-256 cipher suites. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/ctrl_iface.c')
-rw-r--r--wpa_supplicant/ctrl_iface.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index b77a944..b48ee80 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2678,6 +2678,24 @@ static int ctrl_iface_get_capability_pairwise(int res, char *strict,
return len;
}
+ if (capa->enc & WPA_DRIVER_CAPA_ENC_CCMP_256) {
+ ret = os_snprintf(pos, end - pos, "%sCCMP-256",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ first = 0;
+ }
+
+ if (capa->enc & WPA_DRIVER_CAPA_ENC_GCMP_256) {
+ ret = os_snprintf(pos, end - pos, "%sGCMP-256",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ first = 0;
+ }
+
if (capa->enc & WPA_DRIVER_CAPA_ENC_CCMP) {
ret = os_snprintf(pos, end - pos, "%sCCMP", first ? "" : " ");
if (ret < 0 || ret >= end - pos)
@@ -2734,6 +2752,24 @@ static int ctrl_iface_get_capability_group(int res, char *strict,
return len;
}
+ if (capa->enc & WPA_DRIVER_CAPA_ENC_CCMP_256) {
+ ret = os_snprintf(pos, end - pos, "%sCCMP-256",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ first = 0;
+ }
+
+ if (capa->enc & WPA_DRIVER_CAPA_ENC_GCMP_256) {
+ ret = os_snprintf(pos, end - pos, "%sGCMP-256",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ first = 0;
+ }
+
if (capa->enc & WPA_DRIVER_CAPA_ENC_CCMP) {
ret = os_snprintf(pos, end - pos, "%sCCMP", first ? "" : " ");
if (ret < 0 || ret >= end - pos)