From 0c6099f31bb736cc875ae15f9e6d34eb6309be94 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Sat, 15 Nov 2014 10:35:28 +0900 Subject: [PATCH] mesh: Check mesh key management method Signed-off-by: Natsuki Itaya Signed-off-by: Masashi Honma --- wpa_supplicant/config_file.c | 9 +++++++++ wpa_supplicant/ctrl_iface.c | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c index 6c55cfc67..246db0d14 100644 --- a/wpa_supplicant/config_file.c +++ b/wpa_supplicant/config_file.c @@ -143,6 +143,15 @@ static int wpa_config_validate_network(struct wpa_ssid *ssid, int line) ssid->group_cipher &= ~WPA_CIPHER_CCMP; } + if (ssid->mode == WPAS_MODE_MESH && + (ssid->key_mgmt != WPA_KEY_MGMT_NONE && + ssid->key_mgmt != WPA_KEY_MGMT_SAE)) { + wpa_printf(MSG_ERROR, + "Line %d: key_mgmt for mesh network should be open or SAE", + line); + errors++; + } + return errors; } diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 1e4196238..b82f6208b 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2388,6 +2388,12 @@ static int wpa_supplicant_ctrl_iface_mesh_group_add( "CTRL_IFACE: Cannot use MESH_GROUP_ADD on a non mesh network"); return -1; } + if (ssid->key_mgmt != WPA_KEY_MGMT_NONE && + ssid->key_mgmt != WPA_KEY_MGMT_SAE) { + wpa_printf(MSG_ERROR, + "CTRL_IFACE: key_mgmt for mesh network should be open or SAE"); + return -1; + } /* * TODO: If necessary write our own group_add function,