From 3a5954ef98858d5fcf9b6355efa9c1429219f314 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 3 Jul 2017 14:28:24 +0300 Subject: [PATCH] Add mgmt_group_cipher to wpa_supplicant STATUS command This can be used to check which management group cipher is used in an association that uses PMF. Signed-off-by: Jouni Malinen --- src/common/wpa_common.c | 8 ++++++++ src/rsn_supp/wpa.c | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c index 47b0d425b..2250190fd 100644 --- a/src/common/wpa_common.c +++ b/src/common/wpa_common.c @@ -1547,6 +1547,14 @@ const char * wpa_cipher_txt(int cipher) return "GCMP-256"; case WPA_CIPHER_CCMP_256: return "CCMP-256"; + case WPA_CIPHER_AES_128_CMAC: + return "BIP"; + case WPA_CIPHER_BIP_GMAC_128: + return "BIP-GMAC-128"; + case WPA_CIPHER_BIP_GMAC_256: + return "BIP-GMAC-256"; + case WPA_CIPHER_BIP_CMAC_256: + return "BIP-CMAC-256"; case WPA_CIPHER_GTK_NOT_USED: return "GTK_NOT_USED"; default: diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 183823ff4..ab2302b8c 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -2858,9 +2858,12 @@ int wpa_sm_get_status(struct wpa_sm *sm, char *buf, size_t buflen, >= 0 && rsn.capabilities & (WPA_CAPABILITY_MFPR | WPA_CAPABILITY_MFPC)) { - ret = os_snprintf(pos, end - pos, "pmf=%d\n", + ret = os_snprintf(pos, end - pos, "pmf=%d\n" + "mgmt_group_cipher=%s\n", (rsn.capabilities & - WPA_CAPABILITY_MFPR) ? 2 : 1); + WPA_CAPABILITY_MFPR) ? 2 : 1, + wpa_cipher_txt( + sm->mgmt_group_cipher)); if (os_snprintf_error(end - pos, ret)) return pos - buf; pos += ret;