From 793090178b468e9952958d1fe299129ef80a8810 Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Fri, 19 Apr 2024 18:44:14 +0200
Subject: [PATCH] Reduce CoAP dependencies to common for-riot-rs branch

After https://github.com/kaspar030/embassy/pull/1 was merged
---
 Cargo.lock | 468 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 Cargo.toml |  19 +--
 2 files changed, 459 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ebb6188ec..1097c0c91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,6 +29,20 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -58,6 +72,12 @@ dependencies = [
  "riot-rs-rt",
 ]
 
+[[package]]
+name = "alloc-traits"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483"
+
 [[package]]
 name = "anyhow"
 version = "1.0.81"
@@ -130,6 +150,17 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -188,6 +219,28 @@ dependencies = [
  "riot-rs-boards",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.63.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 1.0.109",
+ "which",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -254,6 +307,31 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
+[[package]]
+name = "cbindgen"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d"
+dependencies = [
+ "clap",
+ "heck",
+ "indexmap 1.9.3",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 1.0.109",
+ "tempfile",
+ "toml 0.5.11",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
+
 [[package]]
 name = "ccm"
 version = "0.5.0"
@@ -266,12 +344,45 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.35"
@@ -295,6 +406,42 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
  "crypto-common",
  "inout",
+ "zeroize",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "atty",
+ "bitflags 1.3.2",
+ "clap_lex",
+ "indexmap 1.9.3",
+ "strsim",
+ "termcolor",
+ "textwrap",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
 ]
 
 [[package]]
@@ -312,6 +459,7 @@ dependencies = [
  "coap-handler-implementations",
  "coap-message",
  "coap-message-demos",
+ "coap-message-implementations",
  "coap-message-utils",
  "coap-numbers",
  "coap-request",
@@ -327,10 +475,13 @@ dependencies = [
  "hexlit",
  "lakers",
  "lakers-crypto-rustcrypto",
+ "liboscore",
+ "liboscore-msgbackend",
  "minicbor 0.23.0",
  "riot-rs",
  "riot-rs-boards",
  "smoltcp",
+ "static-alloc",
 ]
 
 [[package]]
@@ -390,21 +541,22 @@ dependencies = [
 
 [[package]]
 name = "coap-message-implementations"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34293ae8447d52635184f556489bad7fa564d94cde3d00b170e2727964bc3645"
+checksum = "65b11a790471777e78eb68d908d300034b07a98bc43378a6b81159948c1361cd"
 dependencies = [
  "coap-message",
  "coap-message-utils",
  "coap-numbers",
+ "document-features",
  "heapless 0.5.6",
 ]
 
 [[package]]
 name = "coap-message-utils"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ebb49f08ced17ea3a47a9206d99186849665854cea1fd064509008ed0cdfc4b"
+checksum = "d57c1e386dfabcc211aefd8d0cc64e8fa6ebc799736ee639a888e0e2af2734ea"
 dependencies = [
  "coap-message",
  "coap-numbers",
@@ -828,7 +980,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.5.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "cortex-m",
  "critical-section",
@@ -859,7 +1011,7 @@ checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067"
 [[package]]
 name = "embassy-hal-internal"
 version = "0.1.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "cortex-m",
  "critical-section",
@@ -888,7 +1040,7 @@ dependencies = [
 [[package]]
 name = "embassy-net"
 version = "0.4.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "as-slice 0.2.1",
  "atomic-pool",
@@ -909,7 +1061,7 @@ dependencies = [
 [[package]]
 name = "embassy-net-driver"
 version = "0.2.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 
 [[package]]
 name = "embassy-net-driver-channel"
@@ -951,7 +1103,7 @@ dependencies = [
 [[package]]
 name = "embassy-nrf"
 version = "0.1.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "bitflags 2.4.2",
  "cfg-if",
@@ -1039,7 +1191,7 @@ dependencies = [
 [[package]]
 name = "embassy-sync"
 version = "0.5.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -1051,7 +1203,7 @@ dependencies = [
 [[package]]
 name = "embassy-time"
 version = "0.3.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -1068,7 +1220,7 @@ dependencies = [
 [[package]]
 name = "embassy-time-driver"
 version = "0.1.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 dependencies = [
  "document-features",
 ]
@@ -1076,7 +1228,7 @@ dependencies = [
 [[package]]
 name = "embassy-time-queue-driver"
 version = "0.1.0"
-source = "git+https://github.com/chrysn-pull-requests/embassy?branch=for-riot-rs-100424-plus-embeddednal#e5d9097ea615a17b1c89846f36c344db4d8fd4b6"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-100424#58d45e9889216bc0e35ef1d580edfba534e5f408"
 
 [[package]]
 name = "embassy-usb"
@@ -1325,6 +1477,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "esp-hal"
 version = "0.15.0"
@@ -1546,6 +1708,12 @@ dependencies = [
  "riot-rs-rt",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -1721,6 +1889,16 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.1"
@@ -1781,6 +1959,12 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
 [[package]]
 name = "hashbrown"
 version = "0.13.2"
@@ -1848,6 +2032,15 @@ dependencies = [
  "riot-rs-boards",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -1878,6 +2071,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys",
+]
+
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -1890,6 +2092,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.2.5"
@@ -1915,7 +2127,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys",
 ]
@@ -2017,6 +2229,18 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
 [[package]]
 name = "ld-memory"
 version = "0.2.9"
@@ -2035,12 +2259,66 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "libm"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
+[[package]]
+name = "liboscore"
+version = "0.1.0"
+source = "git+https://gitlab.com/oscore/liboscore/#e7a4ecd037cbb9c7f085047fec5896f4bdc68d50"
+dependencies = [
+ "bindgen",
+ "cbindgen",
+ "cc",
+ "coap-message",
+ "coap-message-implementations",
+ "coap-numbers",
+ "liboscore-cryptobackend",
+ "liboscore-msgbackend",
+ "pretty-hex",
+]
+
+[[package]]
+name = "liboscore-cryptobackend"
+version = "0.1.0"
+source = "git+https://gitlab.com/oscore/liboscore/#e7a4ecd037cbb9c7f085047fec5896f4bdc68d50"
+dependencies = [
+ "aead",
+ "aes",
+ "aes-gcm",
+ "ccm",
+ "chacha20poly1305",
+ "crypto-common",
+ "heapless 0.7.17",
+ "hkdf",
+ "hmac",
+ "sha2",
+ "typenum",
+]
+
+[[package]]
+name = "liboscore-msgbackend"
+version = "0.1.0"
+source = "git+https://gitlab.com/oscore/liboscore/#e7a4ecd037cbb9c7f085047fec5896f4bdc68d50"
+dependencies = [
+ "coap-message",
+ "coap-message-implementations",
+ "coap-numbers",
+]
+
 [[package]]
 name = "libredox"
 version = "0.0.1"
@@ -2078,6 +2356,12 @@ dependencies = [
  "syn 2.0.52",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
 [[package]]
 name = "litrs"
 version = "0.4.1"
@@ -2175,6 +2459,12 @@ dependencies = [
  "riot-rs-boards",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.2"
@@ -2217,6 +2507,16 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
 
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "nrf51"
 version = "0.1.0"
@@ -2477,6 +2777,18 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -2537,6 +2849,12 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
 [[package]]
 name = "petgraph"
 version = "0.6.4"
@@ -2544,7 +2862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 2.2.5",
 ]
 
 [[package]]
@@ -2627,6 +2945,29 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.6.0"
@@ -2669,6 +3010,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "pretty-hex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
+
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -3078,6 +3425,12 @@ dependencies = [
  "ufmt-write",
 ]
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -3096,6 +3449,19 @@ dependencies = [
  "semver 1.0.22",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -3220,6 +3586,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -3235,7 +3607,7 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 [[package]]
 name = "smoltcp"
 version = "0.11.0"
-source = "git+https://github.com/chrysn-pull-requests/smoltcp.git?branch=pktinfo#dc603000787234208c63078ca0e01bb8b934df4a"
+source = "git+https://github.com/smoltcp-rs/smoltcp.git#125773e282bc2e0c914a49e9c75573926e26e558"
 dependencies = [
  "bitflags 1.3.2",
  "byteorder",
@@ -3269,6 +3641,15 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
+[[package]]
+name = "static-alloc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2975e035ce16539eecee08d7c6e5626ca26f299c6e90af343b302c6dd2e61e"
+dependencies = [
+ "alloc-traits",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -3413,6 +3794,18 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "term"
 version = "0.7.0"
@@ -3433,6 +3826,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+
 [[package]]
 name = "thiserror"
 version = "1.0.58"
@@ -3470,6 +3869,15 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml"
 version = "0.8.11"
@@ -3493,7 +3901,7 @@ dependencies = [
  "quote",
  "serde",
  "syn 2.0.52",
- "toml",
+ "toml 0.8.11",
 ]
 
 [[package]]
@@ -3511,7 +3919,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap",
+ "indexmap 2.2.5",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -3522,7 +3930,7 @@ version = "0.22.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992"
 dependencies = [
- "indexmap",
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3599,6 +4007,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "usb-device"
 version = "0.2.9"
@@ -3673,6 +4091,18 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/Cargo.toml b/Cargo.toml
index 1a4e09605..57195c6b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,19 +85,20 @@ opt-level = 3
 
 [patch.crates-io]
 # riot-rs embassy fork
-embassy-executor = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-hal-internal = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-nrf = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
+embassy-executor = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-hal-internal = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-nrf = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-net = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+# No direct changes there, but required by embassy-net
+embassy-sync = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-time = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-time-driver = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-time-queue-driver = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
+embassy-net-driver = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-100424" }
 
 usbd-hid-macros = { git = "https://github.com/kaspar030/usbd-hid", branch = "for-riot-rs" }
 
 smoltcp.git = "https://github.com/smoltcp-rs/smoltcp.git" # version 0.12-to-be
-embassy-net = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-sync = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-time = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-time-driver = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-time-queue-driver = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
-embassy-net-driver = { git = "https://github.com/chrysn-pull-requests/embassy", branch = "for-riot-rs-100424-plus-embeddednal" }
 
 [workspace.lints.rust]
 unsafe_op_in_unsafe_fn = "warn"