dde_linux: update wpa_supplicant to version 2.10

The supplicant is updated to the current release and is now downloaded as archive rather than pulled from git. For the time being 'libnl' is still kept at 3.2.25 as the current 3.7.0 release relies on more Linux infrastructure that our integration does not provide. Issue #4861.
2024-12-19 05:37:54 +00:00 · 2023-05-11 10:40:11 +02:00 · 2023-05-11 10:40:11 +02:00 · 080b0fb9b3
commit 080b0fb9b3
parent ea0a692879
7 changed files with 33 additions and 33 deletions
--- a/repos/dde_linux/lib/mk/wpa_supplicant.mk
+++ b/repos/dde_linux/lib/mk/wpa_supplicant.mk
@ -15,7 +15,7 @@ INC_DIR += $(REP_DIR)/include


 # wpa_supplicant
-SRC_C_wpa_supplicant = blacklist.c      \
+SRC_C_wpa_supplicant = bssid_ignore.c   \
                       bgscan.c         \
                       bgscan_simple.c  \
                       bss.c            \
@ -26,17 +26,25 @@ SRC_C_wpa_supplicant = blacklist.c      \
                       events.c         \
                       notify.c         \
                       op_classes.c     \
+                       robust_av.c      \
                       rrm.c            \
                       scan.c           \
                       sme.c            \
                       wmm_ac.c         \
                       wpa_supplicant.c \
                       wpas_glue.c
+#
+# Disable warning as the pointer in question is only used as
+# token to check against a stored pointer.
+#
+CC_OPT_wpa_supplicant/bss += -Wno-use-after-free
+
 SRC_C   += $(addprefix wpa_supplicant/, $(SRC_C_wpa_supplicant))
 INC_DIR += $(WS_CONTRIB_DIR)/wpa_supplicant
 CC_OPT  += -DCONFIG_BACKEND_FILE -DCONFIG_NO_CONFIG_WRITE \
           -DCONFIG_SME -DCONFIG_CTRL_IFACE \
-           -DCONFIG_BGSCAN -DCONFIG_BGSCAN_SIMPLE
+           -DCONFIG_BGSCAN -DCONFIG_BGSCAN_SIMPLE \
+           -DCONFIG_OPENSSL_CMAC -DCONFIG_SHA256

 CC_OPT  += -DTLS_DEFAULT_CIPHERS=\"DEFAULT:!EXP:!LOW\"

@ -54,6 +62,7 @@ SRC_C_crypto = crypto_openssl.c \
               random.c         \
               sha1-prf.c       \
               sha1-tlsprf.c    \
+               sha256-prf.c     \
               tls_openssl.c
 SRC_C += $(addprefix src/crypto/, $(SRC_C_crypto))
 INC_DIR += $(WS_CONTRIB_DIR)/src/crypto
@ -103,6 +112,7 @@ CC_OPT  += -DCONFIG_PEERKEY
 SRC_C_utils = base64.c    \
              bitfield.c  \
              common.c    \
+              config.c    \
              eloop.c     \
              os_unix.c   \
              radiotap.c  \
--- a/repos/dde_linux/patches/wpa_supplicant.patch
+++ b/repos/dde_linux/patches/wpa_supplicant.patch
@ -1,8 +1,8 @@
 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
-index 5cff47fab..af08177b2 100644
+index aec179a..6c07c73 100644
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
-@@ -1682,13 +1682,13 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
+@@ -1985,13 +1985,13 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
 {
 	struct wpa_driver_nl80211_data *drv = ctx;
 
@ -18,7 +18,7 @@ index 5cff47fab..af08177b2 100644
 		wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED, NULL);
 }
 
-@@ -1696,7 +1696,7 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
+@@ -1999,7 +1999,7 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
 static void wpa_driver_nl80211_rfkill_unblocked(void *ctx)
 {
 	struct wpa_driver_nl80211_data *drv = ctx;
@ -27,7 +27,7 @@ index 5cff47fab..af08177b2 100644
 	if (i802_set_iface_flags(drv->first_bss, 1)) {
 		wpa_printf(MSG_DEBUG, "nl80211: Could not set interface UP "
 			   "after rfkill unblock");
-@@ -1710,7 +1710,7 @@ static void wpa_driver_nl80211_rfkill_unblocked(void *ctx)
+@@ -2013,7 +2013,7 @@ static void wpa_driver_nl80211_rfkill_unblocked(void *ctx)
 	 * rtnetlink ifup handler will report interfaces other than the P2P
 	 * Device interface as enabled.
 	 */
@ -36,7 +36,7 @@ index 5cff47fab..af08177b2 100644
 		wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED, NULL);
 }
 
-@@ -7645,7 +7645,7 @@ static void * nl80211_global_init(void *ctx)
+@@ -8709,7 +8709,7 @@ static void * nl80211_global_init(void *ctx)
 	if (wpa_driver_nl80211_init_nl_global(global) < 0)
 		goto err;
 
@ -46,7 +46,7 @@ index 5cff47fab..af08177b2 100644
 		wpa_printf(MSG_ERROR, "nl80211: socket(PF_INET,SOCK_DGRAM) failed: %s",
 			   strerror(errno));
 diff --git a/src/drivers/netlink.c b/src/drivers/netlink.c
-index 0e960f48c..38fb26c18 100644
+index 0e960f4..38fb26c 100644
 --- a/src/drivers/netlink.c
 +++ b/src/drivers/netlink.c
@@ -13,6 +13,8 @@
@ -59,10 +59,10 @@ index 0e960f48c..38fb26c18 100644
 struct netlink_data {
 	struct netlink_config *cfg;
 diff --git a/src/utils/common.c b/src/utils/common.c
-index 1eb33705b..e4447306a 100644
+index 2c12751..e9047d5 100644
 --- a/src/utils/common.c
 +++ b/src/utils/common.c
-@@ -498,12 +498,12 @@ void printf_encode(char *txt, size_t maxlen, const u8 *data, size_t len)
+@@ -509,12 +509,12 @@ void printf_encode(char *txt, size_t maxlen, const u8 *data, size_t len)
 			*txt++ = 't';
 			break;
 		default:
@ -80,24 +80,11 @@ index 1eb33705b..e4447306a 100644
 			break;
 		}
 	}
-diff --git a/src/utils/eloop.c b/src/utils/eloop.c
-index 436bc8c99..f5ff4facb 100644
--- a/src/utils/eloop.c
-+++ b/src/utils/eloop.c
-@@ -28,7 +28,7 @@
- #endif
- 
- #ifdef CONFIG_ELOOP_POLL
-#include <poll.h>
-+#include <sys/poll.h>
- #endif /* CONFIG_ELOOP_POLL */
- 
- #ifdef CONFIG_ELOOP_EPOLL
 diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
-index fe39c25b7..3a682785e 100644
+index bcd67fc..025ec8d 100644
 --- a/wpa_supplicant/ctrl_iface.c
 +++ b/wpa_supplicant/ctrl_iface.c
-@@ -9778,7 +9778,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+@@ -11447,7 +11447,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
 					 char *buf, size_t *resp_len)
 {
 	char *reply;
--- a/repos/dde_linux/ports/wpa_supplicant.hash
+++ b/repos/dde_linux/ports/wpa_supplicant.hash
@ -1 +1 @@
-99cb873478b28fde24664d6a587ee5df166cd516
+6242912dd6f6c22550a7fe0b443bfd80c5cfedae
--- a/repos/dde_linux/ports/wpa_supplicant.port
+++ b/repos/dde_linux/ports/wpa_supplicant.port
@ -1,12 +1,12 @@
 LICENSE     := BSD-3-Clause
-VERSION     := git
-DOWNLOADS   := wpa_supplicant.git
+VERSION     := 2.10
+DOWNLOADS   := wpa_supplicant.archive

 #
 # wpa_supplicant sources
 #
-URL(wpa_supplicant) := git://w1.fi/srv/git/hostap.git
-REV(wpa_supplicant) := 25bd4e7beb582509596fe60cb3591e1299f3121b
+URL(wpa_supplicant) := https://w1.fi/releases/wpa_supplicant-2.10.tar.gz
+SHA(wpa_supplicant) := 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f
 DIR(wpa_supplicant) := src/app/wpa_supplicant

 #
--- a/repos/dde_linux/src/lib/wpa_supplicant/ctrl_iface_genode.c
+++ b/repos/dde_linux/src/lib/wpa_supplicant/ctrl_iface_genode.c
@ -222,8 +222,11 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
 }


-void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
+void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s,
+                                      struct ctrl_iface_priv *priv)
 {
+	(void)wpa_s;
+
 	os_free(priv);
 }

--- a/repos/dde_linux/src/lib/wpa_supplicant/symbol.map
+++ b/repos/dde_linux/src/lib/wpa_supplicant/symbol.map
@ -21,6 +21,7 @@
 		sha1_vector*;
 		get_ie*;
 		fc2str*;
+		is_6ghz_freq;

 	local:

--- a/repos/pc/recipes/src/pc_wifi_drv/content.mk
+++ b/repos/pc/recipes/src/pc_wifi_drv/content.mk
@ -64,8 +64,7 @@ $(MIRROR_FROM_LIBNL_PORT_DIR):
 	cp -r $(LIBNL_PORT_DIR)/$@ $@

 cleanup-wpa: $(MIRROR_FROM_WS_PORT_DIR)
-	@for dir in .git doc eap_example hs20 mac80211_hwsim radius_example \
-		hostapd tests wlantest wpadebug wpaspy; do \
+	@for dir in hs20; do \
 		rm -rf src/app/wpa_supplicant/$$dir; done

 content: LICENSE