From f8b88c0c6334a32217f01792bfbf42c627ec6efe Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Thu, 4 Sep 2025 03:23:50 +0000 Subject: [PATCH 1/5] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 267f837a8..938bba7c5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -801,7 +801,7 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config) if (InKeyMgmtBitset(config, config.keyMgmt)) { return; } - int index = FindKeyMgmtPosition(config.keyMgmt); + unsigned int index = FindKeyMgmtPosition(config.keyMgmt); // Invalid keyMgmt if (index < 0) { return; @@ -813,9 +813,6 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config) } if (config.keyMgmt == KEY_MGMT_SAE) { index = FindKeyMgmtPosition(KEY_MGMT_WPA_PSK); - if (index < 0) { - return; - } config.keyMgmtBitset |= (1 << index); } } -- Gitee From 5690a8ce0c6eea52b741ba1f77000ded7ca0ac87 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Thu, 4 Sep 2025 06:33:45 +0000 Subject: [PATCH 2/5] update wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp. Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 938bba7c5..d1eb01787 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -801,7 +801,7 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config) if (InKeyMgmtBitset(config, config.keyMgmt)) { return; } - unsigned int index = FindKeyMgmtPosition(config.keyMgmt); + static_cast(index) = FindKeyMgmtPosition(config.keyMgmt); // Invalid keyMgmt if (index < 0) { return; -- Gitee From 4c67b459dad8fb3cc1c8f8f0ee5f3fd3287dad5f Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Thu, 4 Sep 2025 06:48:47 +0000 Subject: [PATCH 3/5] update wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp. Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index d1eb01787..8cbcc1f81 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -802,10 +802,7 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config) return; } static_cast(index) = FindKeyMgmtPosition(config.keyMgmt); - // Invalid keyMgmt - if (index < 0) { - return; - } + config.keyMgmtBitset |= (1 << index); if (config.keyMgmt == KEY_MGMT_WPA_PSK) { index = FindKeyMgmtPosition(KEY_MGMT_SAE); -- Gitee From 4c41f17a3dd12c9aa681d308e3e07c49201197e5 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Thu, 4 Sep 2025 11:02:10 +0000 Subject: [PATCH 4/5] update wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp. Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_toolkit/config/wifi_settings.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 8cbcc1f81..8f2d040ff 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -801,12 +801,17 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config) if (InKeyMgmtBitset(config, config.keyMgmt)) { return; } - static_cast(index) = FindKeyMgmtPosition(config.keyMgmt); + int index = FindKeyMgmtPosition(config.keyMgmt); + // Invalid keyMgmt + if (index < 0) { + return; + } + unsigned int uindex = static_cast(index); - config.keyMgmtBitset |= (1 << index); + config.keyMgmtBitset |= (1 << uindex); if (config.keyMgmt == KEY_MGMT_WPA_PSK) { index = FindKeyMgmtPosition(KEY_MGMT_SAE); - config.keyMgmtBitset |= (1 << index); + config.keyMgmtBitset |= (1 << uindex); } if (config.keyMgmt == KEY_MGMT_SAE) { index = FindKeyMgmtPosition(KEY_MGMT_WPA_PSK); -- Gitee From f8a96e113ab5385e6b95cb0aeab3b2b62bbe3f63 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Thu, 4 Sep 2025 11:03:29 +0000 Subject: [PATCH 5/5] update wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp. Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_toolkit/config/wifi_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp index 8f2d040ff..1d519dec5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_settings.cpp @@ -815,7 +815,7 @@ void WifiSettings::SetKeyMgmtBitset(WifiDeviceConfig &config) } if (config.keyMgmt == KEY_MGMT_SAE) { index = FindKeyMgmtPosition(KEY_MGMT_WPA_PSK); - config.keyMgmtBitset |= (1 << index); + config.keyMgmtBitset |= (1 << uindex); } } -- Gitee