From b8482562af98f452c24bf7509a044b75ceea8805 Mon Sep 17 00:00:00 2001 From: Bruin06 <419738327@qq.com> Date: Wed, 12 Mar 2025 14:55:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?cpe=E8=B7=AF=E7=94=B1=E6=BC=AB=E6=B8=B8?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bruin06 <419738327@qq.com> --- wpa_supplicant-2.9_standard/src/common/wpa_common.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wpa_supplicant-2.9_standard/src/common/wpa_common.c b/wpa_supplicant-2.9_standard/src/common/wpa_common.c index 668ae7b..31458bb 100644 --- a/wpa_supplicant-2.9_standard/src/common/wpa_common.c +++ b/wpa_supplicant-2.9_standard/src/common/wpa_common.c @@ -2888,6 +2888,12 @@ int wpa_compare_rsn_ie(int ft_initial_assoc, if (wpa_parse_wpa_ie_rsn(ie1, ie1len, &ie1d) < 0 || wpa_parse_wpa_ie_rsn(ie2, ie2len, &ie2d) < 0) return -1; +#ifdef CONFIG_OPEN_HARMONY_PATCH + int mask == 0xFF3F; + ie1d.capabilities &= mask; + ie2d.capabilities &= mask; + return 0; +#else if (ie1d.proto == ie2d.proto && ie1d.pairwise_cipher == ie2d.pairwise_cipher && ie1d.group_cipher == ie2d.group_cipher && @@ -2895,6 +2901,7 @@ int wpa_compare_rsn_ie(int ft_initial_assoc, ie1d.capabilities == ie2d.capabilities && ie1d.mgmt_group_cipher == ie2d.mgmt_group_cipher) return 0; +#endif } #endif /* CONFIG_IEEE80211R */ -- Gitee From 0b2ee43441e281ea97afe0f204f6b036e432644e Mon Sep 17 00:00:00 2001 From: Bruin06 <15325335+bruin06@user.noreply.gitee.com> Date: Wed, 12 Mar 2025 10:42:45 +0000 Subject: [PATCH 2/2] update wpa_supplicant-2.9_standard/src/common/wpa_common.c. Signed-off-by: Bruin06 <15325335+bruin06@user.noreply.gitee.com> --- wpa_supplicant-2.9_standard/src/common/wpa_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant-2.9_standard/src/common/wpa_common.c b/wpa_supplicant-2.9_standard/src/common/wpa_common.c index 31458bb..85beccc 100644 --- a/wpa_supplicant-2.9_standard/src/common/wpa_common.c +++ b/wpa_supplicant-2.9_standard/src/common/wpa_common.c @@ -2889,7 +2889,7 @@ int wpa_compare_rsn_ie(int ft_initial_assoc, wpa_parse_wpa_ie_rsn(ie2, ie2len, &ie2d) < 0) return -1; #ifdef CONFIG_OPEN_HARMONY_PATCH - int mask == 0xFF3F; + int mask = 0xFF3F; ie1d.capabilities &= mask; ie2d.capabilities &= mask; return 0; -- Gitee