Skip to content

Commit 61ba9d2

Browse files
committed
Update dependencies
1 parent 0646763 commit 61ba9d2

9 files changed

Lines changed: 226 additions & 238 deletions

File tree

.zed-workspace/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
"allowed": true,
2626
"parser": "html"
2727
}
28+
},
29+
"CMake": {
30+
"tab_size": 4
2831
}
2932
},
3033
"file_types": {

patches/wireguard/0002-psa-ephemeral-cleanup.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

patches/wolfssl.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/internal.c b/src/internal.c
2-
index 0ffe6c51f..d31254600 100644
2+
index ad1587e0f..3f5897a41 100644
33
--- a/src/internal.c
44
+++ b/src/internal.c
5-
@@ -10789,7 +10789,7 @@ static void AddRecordHeader(byte* output, word32 length, byte type,
5+
@@ -10870,7 +10870,7 @@ static void AddRecordHeader(byte* output, word32 length, byte type,
66
#if !defined(WOLFSSL_NO_TLS12) || (defined(HAVE_SESSION_TICKET) && \
77
!defined(NO_WOLFSSL_SERVER)) || \
88
defined(HAVE_CERTIFICATE_STATUS_REQUEST) || \
@@ -12,10 +12,10 @@ index 0ffe6c51f..d31254600 100644
1212
static void AddHandShakeHeader(byte* output, word32 length,
1313
word32 fragOffset, word32 fragLength,
1414
diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c
15-
index b0f8c07aa..839b7421b 100644
15+
index 92283abdf..5de37d847 100644
1616
--- a/wolfcrypt/src/wc_port.c
1717
+++ b/wolfcrypt/src/wc_port.c
18-
@@ -4000,7 +4000,7 @@ time_t z_time(time_t * timer)
18+
@@ -4125,7 +4125,7 @@ time_t z_time(time_t * timer)
1919

2020
/* Fallback to uptime since boot. This works for relative times, but
2121
* not for ASN.1 date validation */

patches/zephyr-arp-eth.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ index ef6bbfee39e..5c58bcff3a0 100644
9090
#define net_arp_clear_cache(...)
9191
#define net_arp_foreach(...) 0
9292
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
93-
index c48d5cce18d..53448fc4b2e 100644
93+
index 9e82bacb9f2..c0b03f2cb82 100644
9494
--- a/subsys/net/l2/ethernet/ethernet.c
9595
+++ b/subsys/net/l2/ethernet/ethernet.c
9696
@@ -488,7 +488,8 @@ static bool ethernet_fill_in_dst_on_ipv4_mcast(struct net_pkt *pkt,

patches/zephyr-ipv6.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c
2-
index fc6c2d1177f..bf74ed4f1a1 100644
2+
index 0cd40c51076..3473322a1cc 100644
33
--- a/subsys/net/ip/ipv6.c
44
+++ b/subsys/net/ip/ipv6.c
5-
@@ -607,14 +607,30 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt)
5+
@@ -617,14 +617,30 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt)
66

77
if (!net_ipv6_is_addr_mcast_raw(hdr->dst)) {
88
if (!net_if_ipv6_addr_lookup_by_iface_raw(pkt_iface, hdr->dst)) {
@@ -91,7 +91,7 @@ index 860a02bb54a..ca16d61eda9 100644
9191
}
9292
}
9393
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
94-
index 2cde3ab535d..d031e24dc14 100644
94+
index 08a418e1498..424727ddaba 100644
9595
--- a/subsys/net/ip/net_if.c
9696
+++ b/subsys/net/ip/net_if.c
9797
@@ -1161,7 +1161,7 @@ static void join_mcast_allnodes(struct net_if *iface)

tun/test.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def spawn(config: str) -> subprocess.Popen:
4444
c = tomllib.loads(config)
4545
role = c["role"]
4646
log(f"running {role} {c['endpoint']} pid {process.pid}")
47+
assert process.stdin
4748
process.stdin.write(config)
4849
process.stdin.close()
4950
processes[process] = role
@@ -64,6 +65,7 @@ def terminated(process: subprocess.Popen, exit_code: int):
6465
log(f"checking {processes[process]} pid {process.pid} has been terminated")
6566
process.wait(1)
6667
assert process.poll() is not None
68+
assert process.stderr
6769
assert not process.stderr.read()
6870
log(f"checking exit code is {exit_code}")
6971
assert process.returncode == exit_code
@@ -78,6 +80,7 @@ def killall():
7880

7981
def assert_line_generic(process: subprocess.Popen, tag: str, err: bool, timeout: int):
8082
log(f'looking for "{tag}" for {processes[process]} pid {process.pid}')
83+
assert process.stderr and process.stdout
8184
start_time = time.time()
8285
while True:
8386
elapsed = time.time() - start_time
@@ -332,7 +335,7 @@ def test_connect_disconnect_udp():
332335
terminate(server)
333336

334337

335-
if len(sys.argv) > 3:
338+
if len(sys.argv) < 2 or len(sys.argv) > 3:
336339
print("Usage: python3 test.py <tun-executable-path> [verbose]")
337340
sys.exit()
338341

west.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ manifest:
22
projects:
33
- name: zephyr
44
url: https://github.com/zephyrproject-rtos/zephyr
5-
revision: 09ad7174e940fde3bdd2e24214ca249c12a41cb8
5+
revision: v4.4.0
66
import:
77
file: west.yml
88
name-allowlist:
@@ -14,11 +14,11 @@ manifest:
1414

1515
- name: wolfssl
1616
url: https://github.com/wolfSSL/wolfssl
17-
revision: v5.9.0-stable
17+
revision: v5.9.1-stable
1818

1919
- name: tomlc17
2020
url: https://github.com/cktan/tomlc17
21-
revision: R260302
21+
revision: R260414
2222

2323
- name: cryptogams
2424
url: https://github.com/dot-asm/cryptogams

0 commit comments

Comments
 (0)