commit 9ec1700
Michael Forney
·
2025-04-04 19:46:18 +0000 UTC
parent 6251821
wpa_supplicant: Update to 2.11
9 files changed,
+39,
-27
+1,
-1
1@@ -1,2 +1,2 @@
2 /src
3-/wpa_supplicant-2.10.tar.gz
4+/wpa_supplicant-2.11.tar.gz
+3,
-0
1@@ -11,6 +11,9 @@
2 #define CONFIG_NO_CONFIG_WRITE
3 #define CONFIG_NO_RADIUS
4 #define CONFIG_NO_VLAN
5+#define CONFIG_NO_WMM_AC
6+#define CONFIG_NO_TKIP
7+#define CONFIG_NO_ROBUST_AV
8 #define CONFIG_SHA256
9 #define CONFIG_SME
10 #define TLS_DEFAULT_CIPHERS "DEFAULT:!EXP:!LOW"
+12,
-7
1@@ -13,7 +13,7 @@ pkg.deps = {
2 'pkg/linux-headers/headers',
3 }
4
5-lib('libcommon.a', 'src/utils/(common.c config.c eloop.c os_unix.c wpabuf.c wpa_debug.c)')
6+lib('libcommon.a', 'src/utils/(common.c eloop.c os_unix.c wpabuf.c wpa_debug.c)')
7
8 exe('bin/wpa_supplicant', [[
9 src/ap/(
10@@ -25,15 +25,16 @@ exe('bin/wpa_supplicant', [[
11 ctrl_iface_common.c
12 hw_features_common.c
13 ieee802_11_common.c
14+ ptksa_cache.c
15 wpa_common.c
16 )
17 src/crypto/(
18 aes-internal-dec.c
19 aes-internal-enc.c
20 aes-internal.c
21+ aes-omac1.c
22 aes-unwrap.c
23 aes-wrap.c
24- aes-omac1.c
25 crypto_bearssl.c
26 random.c
27 rc4.c
28@@ -61,8 +62,15 @@ exe('bin/wpa_supplicant', [[
29 wpa.c
30 wpa_ie.c
31 )
32- src/utils/(bitfield.c ip_addr.c crc32.c radiotap.c)
33+ src/utils/(
34+ bitfield.c
35+ config.c
36+ crc32.c
37+ ip_addr.c
38+ radiotap.c
39+ )
40 wpa_supplicant/(
41+ bssid_ignore.c
42 bss.c
43 config.c
44 config_file.c
45@@ -75,14 +83,11 @@ exe('bin/wpa_supplicant', [[
46 notify.c
47 op_classes.c
48 rrm.c
49- twt.c
50- robust_av.c
51 scan.c
52 sme.c
53- wmm_ac.c
54+ twt.c
55 wpa_supplicant.c
56 wpas_glue.c
57- bssid_ignore.c
58 )
59 libcommon.a
60 $builddir/pkg/bearssl/libbearssl.a
R pkg/wpa_supplicant/patch/0003-Avoid-unnecessary-VLA.patch =>
pkg/wpa_supplicant/patch/0002-Avoid-unnecessary-VLA.patch
+4,
-4
1@@ -1,4 +1,4 @@
2-From 936dcefafa77e985a9e8dd2b6f5ef96df16d4c03 Mon Sep 17 00:00:00 2001
3+From 9573da0c85c0b03fe3f11d417af280bca27ecc6b Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Sun, 11 Aug 2019 03:44:24 +0000
6 Subject: [PATCH] Avoid unnecessary VLA
7@@ -8,10 +8,10 @@ Subject: [PATCH] Avoid unnecessary VLA
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10 diff --git a/src/utils/os_unix.c b/src/utils/os_unix.c
11-index 800c50772..447dae31b 100644
12+index 679f3a0dc..aca086c22 100644
13 --- a/src/utils/os_unix.c
14 +++ b/src/utils/os_unix.c
15-@@ -801,7 +801,7 @@ int os_exec(const char *program, const char *arg, int wait_completion)
16+@@ -831,7 +831,7 @@ int os_exec(const char *program, const char *arg, int wait_completion)
17
18 if (pid == 0) {
19 /* run the external command in the child process */
20@@ -21,5 +21,5 @@ index 800c50772..447dae31b 100644
21 char *argv[MAX_ARG + 1];
22 int i;
23 --
24-2.22.0
25+2.45.2
26
R pkg/wpa_supplicant/patch/0004-Prevent-reference-to-undefined-symbol-with-CONFIG_NO.patch =>
pkg/wpa_supplicant/patch/0003-Prevent-reference-to-undefined-symbol-with-CONFIG_NO.patch
+5,
-5
1@@ -1,4 +1,4 @@
2-From 5fba603af060a3fd3f0436213527b4b2b74cbd0d Mon Sep 17 00:00:00 2001
3+From ac2e14a8697e4d3f3fe7237b58e98a387b0c4b9d Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Sun, 11 Aug 2019 04:00:13 +0000
6 Subject: [PATCH] Prevent reference to undefined symbol with CONFIG_NO_RADIUS
7@@ -8,10 +8,10 @@ Subject: [PATCH] Prevent reference to undefined symbol with CONFIG_NO_RADIUS
8 1 file changed, 3 insertions(+)
9
10 diff --git a/src/radius/radius.h b/src/radius/radius.h
11-index 630c0f9d0..dd013c415 100644
12+index 05fddbaf2..ec21150f7 100644
13 --- a/src/radius/radius.h
14 +++ b/src/radius/radius.h
15-@@ -296,6 +296,7 @@ char * radius_msg_get_tunnel_password(struct radius_msg *msg, int *keylen,
16+@@ -330,6 +330,7 @@ char * radius_msg_get_tunnel_password(struct radius_msg *msg, int *keylen,
17 const u8 *secret, size_t secret_len,
18 struct radius_msg *sent_msg, size_t n);
19
20@@ -19,7 +19,7 @@ index 630c0f9d0..dd013c415 100644
21 static inline int radius_msg_add_attr_int32(struct radius_msg *msg, u8 type,
22 u32 value)
23 {
24-@@ -315,6 +316,8 @@ static inline int radius_msg_get_attr_int32(struct radius_msg *msg, u8 type,
25+@@ -349,6 +350,8 @@ static inline int radius_msg_get_attr_int32(struct radius_msg *msg, u8 type,
26 *value = ntohl(val);
27 return 0;
28 }
29@@ -29,5 +29,5 @@ index 630c0f9d0..dd013c415 100644
30 size_t *len, const u8 *start);
31 int radius_msg_count_attr(struct radius_msg *msg, u8 type, int min_len);
32 --
33-2.22.0
34+2.45.2
35
R pkg/wpa_supplicant/patch/0005-Add-support-for-some-BearSSL-crypo-primitives.patch =>
pkg/wpa_supplicant/patch/0004-Add-support-for-some-BearSSL-crypto-primitives.patch
+11,
-7
1@@ -1,19 +1,19 @@
2-From f7dc64ef991c146a491d0ed0a92d2a5890383143 Mon Sep 17 00:00:00 2001
3+From ea00c8e557fe645a1ef0b6c0ebe2209514f9f94f Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Fri, 15 Nov 2019 20:19:37 -0800
6-Subject: [PATCH] Add support for some BearSSL crypo primitives
7+Subject: [PATCH] Add support for some BearSSL crypto primitives
8
9 ---
10- src/crypto/crypto_bearssl.c | 79 +++++++++++++++++++++++++++++++++++++
11- 1 file changed, 79 insertions(+)
12+ src/crypto/crypto_bearssl.c | 83 +++++++++++++++++++++++++++++++++++++
13+ 1 file changed, 83 insertions(+)
14 create mode 100644 src/crypto/crypto_bearssl.c
15
16 diff --git a/src/crypto/crypto_bearssl.c b/src/crypto/crypto_bearssl.c
17 new file mode 100644
18-index 000000000..bc29f9693
19+index 000000000..db2bfbc27
20 --- /dev/null
21 +++ b/src/crypto/crypto_bearssl.c
22-@@ -0,0 +1,79 @@
23+@@ -0,0 +1,83 @@
24 +/*
25 + * Wrapper functions for BearSSL crypto
26 + * Copyright (c) 2019, Michael Forney <mforney@mforney.org>
27@@ -93,6 +93,10 @@ index 000000000..bc29f9693
28 +{
29 + return hmac_vector(key, key_len, 1, &data, &data_len, mac, &br_md5_vtable);
30 +}
31++
32++void crypto_unload(void)
33++{
34++}
35 --
36-2.24.0
37+2.45.2
38
+1,
-1
1@@ -1 +1 @@
2-20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f wpa_supplicant-2.10.tar.gz
3+912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a wpa_supplicant-2.11.tar.gz
+1,
-1
1@@ -1 +1 @@
2-url = "http://w1.fi/releases/wpa_supplicant-2.10.tar.gz"
3+url = "http://w1.fi/releases/wpa_supplicant-2.11.tar.gz"
+1,
-1
1@@ -1 +1 @@
2-2.10 r0
3+2.11 r0