From 1f610d3585e6d177a494f6e9c2fdee8c9ba335fd Mon Sep 17 00:00:00 2001 From: sovtech Date: Mon, 16 Nov 2026 02:40:31 +0000 Subject: [PATCH 1/3] deps: rustix 1.1.6 (RUSTSEC-2026-0486); the desktop lock catches up RUSTSEC-2026-0486 (published 2026-11-16) marks rustix 1.1.5 unsound: its xattr functions mark unwritten bytes initialized when given a zero-length buffer. nfx reaches rustix through iroh-blobs > reflink-copy and never calls the xattr functions, but cargo deny fails every CI check on the advisory. Fixed in 1.1.6. crates/desktop/Cargo.lock also gains cipher 0.5.2 and inout 0.2.6: nfx-proto has needed them since #75 (chacha20 0.10 for NIP-44), and the desktop workspace's lock had not been refreshed. No manifest changes; the money crates' locked closure (crates/ci/locked-compiled.txt) has no rustix and is unchanged. --- crates/Cargo.lock | 12 ++++----- crates/desktop/Cargo.lock | 56 ++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/crates/Cargo.lock b/crates/Cargo.lock index f7dc13d..514383e 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -1350,7 +1350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4217,15 +4217,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags 2.13.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4317,7 +4317,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5713,7 +5713,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] diff --git a/crates/desktop/Cargo.lock b/crates/desktop/Cargo.lock index 9d86921..c4efbaf 100644 --- a/crates/desktop/Cargo.lock +++ b/crates/desktop/Cargo.lock @@ -25,7 +25,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures 0.2.17", ] @@ -37,7 +37,7 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", - "cipher", + "cipher 0.4.4", "ctr", "ghash", "subtle", @@ -620,7 +620,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -642,7 +642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" dependencies = [ "aead", - "cipher", + "cipher 0.4.4", "ctr", "subtle", ] @@ -693,7 +693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures 0.2.17", ] @@ -704,6 +704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", + "cipher 0.5.2", "cpufeatures 0.3.1", "rand_core 0.10.1", ] @@ -716,7 +717,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20 0.9.1", - "cipher", + "cipher 0.4.4", "poly1305", "zeroize", ] @@ -742,10 +743,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common 0.1.7", - "inout", + "inout 0.1.4", "zeroize", ] +[[package]] +name = "cipher" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" +dependencies = [ + "block-buffer 0.12.1", + "crypto-common 0.2.2", + "inout 0.2.6", +] + [[package]] name = "cmake" version = "0.1.58" @@ -1029,7 +1041,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -1362,7 +1374,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1644,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2793,6 +2805,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "inout" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a580c13f0ffc335ef42dd3f6b1a41b726051c5e1656d9a3aa6fddb3c5dfbbf9" +dependencies = [ + "hybrid-array", +] + [[package]] name = "inplace-vec-builder" version = "0.1.1" @@ -3918,6 +3939,7 @@ name = "nfx-node" version = "0.1.1" dependencies = [ "bytes", + "getrandom 0.4.3", "hex", "http-body-util", "hyper", @@ -3930,6 +3952,7 @@ dependencies = [ "nostr-database", "nostr-memory", "nostr-sdk", + "portmapper", "rustls-pki-types", "serde_json", "str0m", @@ -3957,6 +3980,7 @@ name = "nfx-proto" version = "0.1.0" dependencies = [ "base64 0.23.1", + "chacha20 0.10.2", "hex", "k256", "nfx-pay-wire", @@ -4151,7 +4175,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5368,15 +5392,15 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags 2.13.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5434,7 +5458,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7589,7 +7613,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] From 093f4697427aa00c53386929e263cca6b4f2108b Mon Sep 17 00:00:00 2001 From: sovtech Date: Mon, 16 Nov 2026 03:40:11 +0000 Subject: [PATCH 2/3] deps: rustix 1.1.6 keeps windows-sys 0.61.2 (its range is >=0.52,<0.62), so the money crates' closure is unchanged cargo update -p rustix --precise 1.1.6 had moved rustix's windows-sys to 0.52.0, which brought windows-sys 0.52 and windows-targets 0.52.6 into what the money crates are built from, and the lock job refused it. Both locks are validated with cargo metadata --locked --offline. --- crates/Cargo.lock | 2 +- crates/desktop/Cargo.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/Cargo.lock b/crates/Cargo.lock index 514383e..298f3ce 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -4225,7 +4225,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/crates/desktop/Cargo.lock b/crates/desktop/Cargo.lock index c4efbaf..83a137c 100644 --- a/crates/desktop/Cargo.lock +++ b/crates/desktop/Cargo.lock @@ -5400,7 +5400,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] From ba4f601d620713e4bdf94726ef049731bee38b1e Mon Sep 17 00:00:00 2001 From: sovtech Date: Mon, 16 Nov 2026 04:19:59 +0000 Subject: [PATCH 3/3] deps: rebuild both locks from main with only rustix 1.1.6 (and the desktop lock's missing cipher/inout) 093f469 still left errno 0.3.14, rustls-platform-verifier 0.7.0 and winapi-util 0.1.11 on windows-sys 0.52.0 (moved by the same cargo update), so the money crates' closure still differed. Now crates/Cargo.lock differs from main in rustix's version and checksum only, and crates/desktop/Cargo.lock adds cipher 0.5.2 and inout 0.2.6 and the same rustix bump, with no windows-sys line changed. Both validated with cargo metadata --locked --offline. --- crates/Cargo.lock | 6 +++--- crates/desktop/Cargo.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/Cargo.lock b/crates/Cargo.lock index 298f3ce..47a7f0d 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -1350,7 +1350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4317,7 +4317,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5713,7 +5713,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/crates/desktop/Cargo.lock b/crates/desktop/Cargo.lock index 83a137c..b48a5b1 100644 --- a/crates/desktop/Cargo.lock +++ b/crates/desktop/Cargo.lock @@ -1374,7 +1374,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1656,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4175,7 +4175,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5400,7 +5400,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5458,7 +5458,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7613,7 +7613,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]]