From e493f397dc8fed19612efab75e693df6037d73fd Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 11 Aug 2025 08:34:56 +0200 Subject: [PATCH] chore: Update crate dependencies --- Cargo.lock | 313 ++++++++++++++++++++++++++------------- Cargo.toml | 14 +- bin/darkirc/Cargo.toml | 2 +- bin/drk/Cargo.toml | 2 +- src/net/transport/tor.rs | 12 +- src/sdk/Cargo.toml | 2 +- 6 files changed, 226 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db8a52086..87c2b8fd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,13 +245,13 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arti-client" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "855132b9da6a7c968736dda4c1824689073e4e2009817d06f52a70153271235c" +checksum = "375c3b0681ca73c8678dc2e879f01964121955dc8e45f3b334ed0f7e7cefec48" dependencies = [ "async-trait", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more 2.0.1", "educe", @@ -1412,7 +1412,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows", + "windows 0.54.0", ] [[package]] @@ -2281,11 +2281,11 @@ dependencies = [ [[package]] name = "derive-deftly" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55a256deae70e0772adfd583c57c1403c6ddbd1d1f1f84f64e94acaecc25eeb" +checksum = "957bb73a3a9c0bbcac67e129b81954661b3cfcb9e28873d8441f91b54852e77a" dependencies = [ - "derive-deftly-macros 1.1.0", + "derive-deftly-macros 1.2.0", "heck 0.5.0", ] @@ -2309,9 +2309,9 @@ dependencies = [ [[package]] name = "derive-deftly-macros" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47cf90c375e516cf601a57727744bdf7a547680a470a2e8a6580a12288cf0630" +checksum = "9ea41269bd490d251b9eca50ccb43117e641cc68b129849757c15ece88fe0574" dependencies = [ "heck 0.5.0", "indexmap 2.10.0", @@ -3819,7 +3819,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -4137,9 +4137,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15" +checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" dependencies = [ "cc", "pkg-config", @@ -4486,6 +4486,15 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -4626,6 +4635,34 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" +dependencies = [ + "bitflags 2.9.1", +] + +[[package]] +name = "objc2-io-kit" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a" +dependencies = [ + "libc", + "objc2-core-foundation", +] + [[package]] name = "object" version = "0.32.2" @@ -4855,7 +4892,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -5924,9 +5961,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de23c3319433716cf134eed225fe9986bc24f63bed9be9f20c329029e672dc7" +checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" dependencies = [ "bitflags 2.9.1", "fallible-iterator", @@ -6772,6 +6809,20 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "sysinfo" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d" +dependencies = [ + "libc", + "memchr", + "ntapi", + "objc2-core-foundation", + "objc2-io-kit", + "windows 0.61.3", +] + [[package]] name = "tabbycat" version = "0.1.2" @@ -7117,11 +7168,11 @@ checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" [[package]] name = "tor-async-utils" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bee2c4a8ea4cfe533bf284eef89d26f53ed0145854c54471734cb36e451f3e" +checksum = "28240d2b739ecba7514c92c0e42f2b5b81a95b5286366bdb2c2f8ef526a5578c" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "educe", "futures", "oneshot-fused-workaround", @@ -7133,9 +7184,9 @@ dependencies = [ [[package]] name = "tor-basic-utils" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a4e9e4da7ce0f089aee75808db143c4d547ca6d4ffd5b15a1cb042c3082928" +checksum = "55f86a4e4768d337df0e1189eb229c1c27125e86282fabdef89088e1f0be9107" dependencies = [ "derive_more 2.0.1", "hex", @@ -7152,12 +7203,12 @@ dependencies = [ [[package]] name = "tor-bytes" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a4a8401219d99b460c9bc001386366a4c50dc881a0abf346f04c1785f7e06a" +checksum = "7d08b5b2e93fd21a4aaa9a3867962ea82f5dc830522737183abb514bdeae9fc9" dependencies = [ "bytes", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "digest", "educe", "getrandom 0.3.3", @@ -7170,15 +7221,15 @@ dependencies = [ [[package]] name = "tor-cell" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230485eda02aa73aea39aefdc1aff7fbc6304de1ce510de366261727e3007a92" +checksum = "60677bfa808c00539df7f8276facd59f92e5d0bd22ee8e5bdc1ab6a14632db41" dependencies = [ "amplify", "bitflags 2.9.1", "bytes", "caret", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "educe", "paste", @@ -7200,9 +7251,9 @@ dependencies = [ [[package]] name = "tor-cert" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9abc35321d207c3ffbfdc37feb0a9e186555ee49dfaa8079027115ce44491ff2" +checksum = "abd81384d03705336b9fb7ecf152e4f61b2e0a0cb1adbd9bbd116b46a010e230" dependencies = [ "caret", "derive_builder_fork_arti", @@ -7216,9 +7267,9 @@ dependencies = [ [[package]] name = "tor-chanmgr" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85f54ff3c72323739c4903f6b8c5fd1a0b8b8554fbba2c1ffa712c1c7d4faa22" +checksum = "74322fa01b09b3839903da1e7f443b2cf8aecd31f0cfd5395253ddad473b4ef3" dependencies = [ "async-trait", "caret", @@ -7251,9 +7302,9 @@ dependencies = [ [[package]] name = "tor-checkable" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e994401be86ecdaa8b17b176cd1562ddddc6778a47afd751e6db99ccadb8e6" +checksum = "5703d370d4ee4b5c318ac8b944a3b183e2865f6f0104475d36b9e1b8c89f0f38" dependencies = [ "humantime", "signature", @@ -7263,9 +7314,9 @@ dependencies = [ [[package]] name = "tor-circmgr" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efafa2ca72873965c33dcba7375d14d436b584cacb0344b8068f559d8d775bcc" +checksum = "0f8f6d0e84dcf5fa3761e55fe8bb75725e699ee03e3b37bbd06e6421e9961fbd" dependencies = [ "amplify", "async-trait", @@ -7311,13 +7362,13 @@ dependencies = [ [[package]] name = "tor-config" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3280e6e26a30f94d752d55d273c307d2b819971ff4b830101d816990f9a5ec36" +checksum = "3852d0e3a6ca41ab9fed79fa4cb89347bdb24bcd5f6665f506a10b993ac24e8b" dependencies = [ "amplify", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "educe", "either", @@ -7344,9 +7395,9 @@ dependencies = [ [[package]] name = "tor-config-path" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5347bcbe96c660694fe52fb76e852d982d73fe0d92f4c4cb9eaa8427a5d52f17" +checksum = "bf19ba283027eb8d8c441eec743d2c73c971c4b22c9830aae87163e8fcdc334e" dependencies = [ "directories", "serde", @@ -7358,9 +7409,9 @@ dependencies = [ [[package]] name = "tor-consdiff" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e230e901c09dd73c81f12402e8c0221d992ee131ff32ac0dde72f972f47e" +checksum = "b5164757c908a50737ebd483a0e29380e53db0b14103f7996751e28964c6d98a" dependencies = [ "digest", "hex", @@ -7370,9 +7421,9 @@ dependencies = [ [[package]] name = "tor-dirclient" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6913b3a246442dca5a02b3002c9820b0e491a03eb9448843bd73782fb2b0d7" +checksum = "a411a66d9a5f41b2e85e8defb17a3641d5827f168e4b175a28db9b987125843f" dependencies = [ "async-compression", "base64ct", @@ -7398,9 +7449,9 @@ dependencies = [ [[package]] name = "tor-dirmgr" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a13cf2d0f3d92b8a0d45b661d7b2978ae726cc252d8a8e4308b750ab3b3275" +checksum = "5c74b75377747b13d338c8ab29c5de44f4485c04c492a15edebed61110e24299" dependencies = [ "async-trait", "base64ct", @@ -7452,9 +7503,9 @@ dependencies = [ [[package]] name = "tor-error" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ae19c74564749c54e14e532ffb15f84807f734d17f452bb3ffb8b1957f06a2" +checksum = "c5566edb4beb34d7be7bc4fc2f653a5119a3ccade26a9237912e53d4f4029e83" dependencies = [ "derive_more 2.0.1", "futures", @@ -7469,9 +7520,9 @@ dependencies = [ [[package]] name = "tor-general-addr" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad9c6e9147f4ee644c80c3b044813cf93a3f802279c49b06aac2f4f33555877" +checksum = "bc9d4a8c4593a0c590c66bae348590fb49dbf04da264cacc0631d71a92e5d2ac" dependencies = [ "derive_more 2.0.1", "thiserror 2.0.12", @@ -7480,13 +7531,13 @@ dependencies = [ [[package]] name = "tor-guardmgr" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ff4df101c82b9731bc9d54b94ffdee6053471cfa3aa78663c53a545d3d3139" +checksum = "aef0ad8a7ba30210b9c5664e10c423cc19f83d55fafdf1c84097be3a01d0dacd" dependencies = [ "amplify", "base64ct", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more 2.0.1", "dyn-clone", @@ -7522,12 +7573,12 @@ dependencies = [ [[package]] name = "tor-hsclient" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ad84737ce249b56f74bede1b09f61a4169979c3cef124012a9447e1790066a" +checksum = "2a0ed4b8790cf8849d10c7ff13db3ec570c2a4aec68331dfe6e1f05d2987d40d" dependencies = [ "async-trait", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "educe", "either", @@ -7566,13 +7617,13 @@ dependencies = [ [[package]] name = "tor-hscrypto" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7469efe5d22466fcaaeec9506bf03426ce59c03ee1b8a7c8b316830b153b40a" +checksum = "163e60a7c8069ea8d8a3031be8620047b21cbed7d535fd9f1662daae7803ccd6" dependencies = [ "cipher", "data-encoding", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "digest", "hex", @@ -7598,15 +7649,15 @@ dependencies = [ [[package]] name = "tor-hsservice" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60ed074e5e9a9eb14e4e98b37d9f08a43538883e71ba916c859dbc4f6ad90f1f" +checksum = "e736178aed67cc200ab84b35b5c9d116a8ed42c2dc2eeaa7ada1828116da500d" dependencies = [ "amplify", "async-trait", "base64ct", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more 2.0.1", "digest", @@ -7656,11 +7707,11 @@ dependencies = [ [[package]] name = "tor-key-forge" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6697b58f1518757b975993d345a261387eb7a86c730cb542ad1ea68284155eaa" +checksum = "3b1ddfa5126b2619a9f27b5c5d1a360acf41f15d99ced37af1f30fc449c65889" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "downcast-rs", "paste", @@ -7677,14 +7728,14 @@ dependencies = [ [[package]] name = "tor-keymgr" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d765c0fd6b1910b427feb1b604fbc85e5768332e9be1e670bf64e698c92606" +checksum = "26e8e0222d2ac27bd8bf4848cd46371fdc72d820940eb38f3d8da616176b3d39" dependencies = [ "amplify", "arrayvec", "cfg-if", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more 2.0.1", "downcast-rs", @@ -7695,6 +7746,7 @@ dependencies = [ "inventory", "itertools 0.14.0", "rand 0.9.2", + "safelog", "serde", "signature", "ssh-key", @@ -7709,20 +7761,21 @@ dependencies = [ "tor-llcrypto", "tor-persist", "tracing", + "visibility", "walkdir", "zeroize", ] [[package]] name = "tor-linkspec" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1feeea901ff88616175c3bcf3fbc53466117e7d655c15253f80260be017333bd" +checksum = "9e6eab944bf3096b1964cbb0f4a3605c1376a35bdfa9d44512464474ffb8e53c" dependencies = [ "base64ct", "by_address", "caret", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more 2.0.1", "hex", @@ -7742,16 +7795,16 @@ dependencies = [ [[package]] name = "tor-llcrypto" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992c49dd4c285c52594858c0e92afe96531203dbe9bb29cfbe6937d94bb3c7ad" +checksum = "8b92fa9a99a066f06cd266287f6f89270c010693cce3c4c2fa38c27abfcda5fb" dependencies = [ "aes", "base64ct", "ctr", "curve25519-dalek", "der-parser", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "digest", "ed25519-dalek", @@ -7781,9 +7834,9 @@ dependencies = [ [[package]] name = "tor-log-ratelim" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511702fd833651896f1e6ca486c1b0d8d3f28b8f8724526ae8260c33ee49b2e8" +checksum = "8fc97bd804ac7aeaf771dc4507c65f8c5fac1d4f8e469551aaa3bf240fce1171" dependencies = [ "futures", "humantime", @@ -7796,11 +7849,12 @@ dependencies = [ [[package]] name = "tor-memquota" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07de5fe3ab545970b36319397b8c5e82fffbad5682581e06d030cfda0296cd9f" +checksum = "f015b156dc186601f46b3f89ebd6ace49ef3b142c9a5004559e5d75a6477cc1f" dependencies = [ - "derive-deftly 1.1.0", + "cfg-if", + "derive-deftly 1.2.0", "derive_more 2.0.1", "dyn-clone", "educe", @@ -7811,6 +7865,7 @@ dependencies = [ "serde", "slotmap-careful", "static_assertions", + "sysinfo", "thiserror 2.0.12", "tor-async-utils", "tor-basic-utils", @@ -7824,9 +7879,9 @@ dependencies = [ [[package]] name = "tor-netdir" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497936529955a5512e2500366aca3f353081f51edde633d5c9fc2124f1da36a6" +checksum = "7874878d0c579e7b1dea5947581a5f2d4ba350af2a20b1946350ef9ace16ebe1" dependencies = [ "async-trait", "bitflags 2.9.1", @@ -7857,9 +7912,9 @@ dependencies = [ [[package]] name = "tor-netdoc" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51ac213a399bf26bc4801495dd17ede3c118d2bedd6575d79c08dbf1379c1a7" +checksum = "4ea853a14cb2011b9f4c45641323e19fbad13010d638dd3d84502e0decf9db0b" dependencies = [ "amplify", "base64ct", @@ -7901,12 +7956,12 @@ dependencies = [ [[package]] name = "tor-persist" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fabc9ba76dbe0ca3b254ed73480455a337c1941904f375d583efcdc57966f98" +checksum = "e899d9dd8104fae50c33f15e00a1515bee15683ff0017cfc003315fcd6a195d6" dependencies = [ "amplify", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "filetime", "fs-mistrust", @@ -7930,9 +7985,9 @@ dependencies = [ [[package]] name = "tor-proto" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89554cb29f3002b33851e5113b10ae97ca395548a11639de557caac01f627f41" +checksum = "c08f8d03310fadbc44e9544777a0bb5a7364564798d2236f00db3c337fb25987" dependencies = [ "amplify", "asynchronous-codec", @@ -7943,7 +7998,7 @@ dependencies = [ "cipher", "coarsetime", "criterion-cycles-per-byte", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_builder_fork_arti", "derive_more 2.0.1", "digest", @@ -7991,9 +8046,9 @@ dependencies = [ [[package]] name = "tor-protover" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af2a2d9610dafe2fd8eb79015f91e0e8881155147d676b190e061ae7ee0403e" +checksum = "0fcc72e258205ca0511bdc84801748c59dd5d7accfd080d909afd11f6b8be182" dependencies = [ "caret", "paste", @@ -8004,9 +8059,9 @@ dependencies = [ [[package]] name = "tor-relay-selection" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5516546b720c83a21636824f2a03c64caf1a72bc1f94ee16672679f1295e7a6" +checksum = "a19816299f125c71bd4ba59be8ea425256aa4494b6a3d39bdb9ccbc385722a70" dependencies = [ "rand 0.9.2", "serde", @@ -8018,9 +8073,9 @@ dependencies = [ [[package]] name = "tor-rtcompat" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75969f63c5147af49753e1c03339d342bc3e53e7412518e52702cc417cff729" +checksum = "e9545fa3b1420df5b165e6bad6537b7202c533311431cabc84ff1908fbca3908" dependencies = [ "async-io", "async-std", @@ -8048,14 +8103,14 @@ dependencies = [ [[package]] name = "tor-rtmock" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e2946c396cf450ea4f9a3b48f2c4125b011da6019d7da7f1e0e7cd37596c9" +checksum = "9a6ca08427dff9e7a22aa08d8c680c56231ce9b6afa35125e8a9a78f6b8e2890" dependencies = [ "amplify", "assert_matches", "async-trait", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "educe", "futures", @@ -8077,13 +8132,13 @@ dependencies = [ [[package]] name = "tor-socksproto" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b7d2a9b7394b8f2c683d282f4a0da08c056ed23b3bb9afdb84cb92d554c77b" +checksum = "e5b33285d16e5695b6aba7c9656387ab0c662781e2911376887b8b61d1a3d2b2" dependencies = [ "amplify", "caret", - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "educe", "safelog", "subtle", @@ -8094,11 +8149,11 @@ dependencies = [ [[package]] name = "tor-units" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22f2bd3dc4f5defec5d4b9d152d911a3a852d08409558dd927ec8eb28e20f9de" +checksum = "40e61ae922f0f0209338d63afd4b1b4ba780313b427a54dda212ca3853845578" dependencies = [ - "derive-deftly 1.1.0", + "derive-deftly 1.2.0", "derive_more 2.0.1", "serde", "thiserror 2.0.12", @@ -8833,6 +8888,28 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + [[package]] name = "windows-core" version = "0.54.0" @@ -8856,6 +8933,17 @@ dependencies = [ "windows-strings", ] +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link", + "windows-threading", +] + [[package]] name = "windows-implement" version = "0.60.0" @@ -8884,6 +8972,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -8995,6 +9093,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" diff --git a/Cargo.toml b/Cargo.toml index 2bd150e87..1f16ab637 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,13 +68,13 @@ futures-rustls = {version = "0.26.0", default-features = false, features = ["log # Pluggable Transports socket2 = {version = "0.6.0", features = ["all"], optional = true} -arti-client = {version = "0.32.0", default-features = false, features = ["async-std", "compression", "error_detail", "rustls", "onion-service-client", "onion-service-service"], optional = true} -tor-error = {version = "0.32.0", optional = true} -tor-rtcompat = {version = "0.32.0", features = ["async-std", "rustls"], optional = true} -tor-hscrypto = {version = "0.32.0", optional = true} -tor-hsservice = {version = "0.32.0", optional = true} -tor-proto = {version = "0.32.0", optional = true} -tor-cell = {version = "0.32.0", optional = true} +arti-client = {version = "0.33.0", default-features = false, features = ["async-std", "compression", "error_detail", "rustls", "onion-service-client", "onion-service-service"], optional = true} +tor-error = {version = "0.33.0", optional = true} +tor-rtcompat = {version = "0.33.0", features = ["async-std", "rustls"], optional = true} +tor-hscrypto = {version = "0.33.0", optional = true} +tor-hsservice = {version = "0.33.0", optional = true} +tor-proto = {version = "0.33.0", optional = true} +tor-cell = {version = "0.33.0", optional = true} # TLS cert utilities ed25519-compact = {version = "2.1.1", optional = true} diff --git a/bin/darkirc/Cargo.toml b/bin/darkirc/Cargo.toml index f4ffb7d62..a8381e3ed 100644 --- a/bin/darkirc/Cargo.toml +++ b/bin/darkirc/Cargo.toml @@ -63,7 +63,7 @@ structopt-toml = "0.5.1" # See https://github.com/rust-mobile/android-rs-glue/issues/193 [target.aarch64-linux-android.dependencies] openssl = { version = "*", features = ["vendored"] } -rusqlite = {version = "0.36.0", features = ["bundled"]} +rusqlite = {version = "0.37.0", features = ["bundled"]} [lints] workspace = true diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index d803e8d52..106a11e4e 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -28,7 +28,7 @@ num-bigint = "0.4.6" prettytable-rs = "0.10.0" rand = "0.8.5" rodio = {version = "0.20.1", default-features = false, features = ["minimp3"]} -rusqlite = {version = "0.36.0", features = ["sqlcipher"]} +rusqlite = {version = "0.37.0", features = ["sqlcipher"]} sled-overlay = "0.1.10" toml = "0.9.5" tracing = "0.1.41" diff --git a/src/net/transport/tor.rs b/src/net/transport/tor.rs index c9ab5ed23..9adc00962 100644 --- a/src/net/transport/tor.rs +++ b/src/net/transport/tor.rs @@ -49,7 +49,7 @@ use tracing::{debug, error, warn}; use url::Url; use super::{PtListener, PtStream}; -use crate::util::{logger::verbose, path::expand_path}; +use crate::util::{logger::verbose, encoding::base32, path::expand_path}; /// A static for `TorClient` reusability static TOR_CLIENT: OnceCell> = OnceCell::new(); @@ -236,15 +236,15 @@ impl TorListener { } }; + let onion_id = + base32::encode(false, onion_service.onion_address().unwrap().as_ref()).to_lowercase(); + verbose!( target: "net::tor::do_listen", - "[P2P] Established Tor listener on tor://{}:{port}", - onion_service.onion_address().unwrap() + "[P2P] Established Tor listener on tor://{}:{port}", onion_id, ); - let endpoint = - Url::parse(&format!("tor://{}:{port}", onion_service.onion_address().unwrap())) - .unwrap(); + let endpoint = Url::parse(&format!("tor://{}:{port}", onion_id)).unwrap(); self.endpoint.set(endpoint).await.expect("fatal endpoint already set for TorListener"); Ok(TorListenerIntern { diff --git a/src/sdk/Cargo.toml b/src/sdk/Cargo.toml index 1b9e69709..ebf0b9008 100644 --- a/src/sdk/Cargo.toml +++ b/src/sdk/Cargo.toml @@ -43,7 +43,7 @@ rand = "0.8.5" # Misc lazy_static = "1.5.0" subtle = "2.6.1" -hashbrown = "0.15.4" +hashbrown = "0.15.5" # Storage sled-overlay = "0.1.9"