diff --git a/Cargo.lock b/Cargo.lock index 795bbb6..323ad07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -117,17 +117,17 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arti-client" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c6c58e0fe132049f6c79c256c8f181df9556cca7fd7e6a5a24f1665151624dd" +checksum = "57064cebe248bf9c0e1df2cce40926cfd9c8cad9c3103c53c594c6c5f7794d8b" dependencies = [ "async-trait", "cfg-if", "derive-deftly", "derive_builder_fork_arti", - "derive_more", + "derive_more 1.0.0", "educe", - "fs-mistrust", + "fs-mistrust 0.8.1", "futures", "hostname-validator", "humantime", @@ -135,28 +135,29 @@ dependencies = [ "libc", "postage", "rand", - "safelog", + "safelog 0.4.1", "serde", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-chanmgr", - "tor-circmgr", - "tor-config", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-chanmgr 0.24.0", + "tor-circmgr 0.24.0", + "tor-config 0.24.0", "tor-dirmgr", - "tor-error", - "tor-guardmgr", + "tor-error 0.24.0", + "tor-guardmgr 0.24.0", "tor-hsclient", - "tor-hscrypto", - "tor-hsservice", - "tor-keymgr", - "tor-linkspec", - "tor-llcrypto", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-rtcompat", + "tor-hscrypto 0.24.0", + "tor-hsservice 0.24.0", + "tor-keymgr 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-memquota", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", + "tor-persist 0.24.0", + "tor-proto 0.24.0", + "tor-rtcompat 0.24.0", "tracing", "void", ] @@ -167,6 +168,44 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "async-compression" version = "0.4.12" @@ -217,8 +256,8 @@ dependencies = [ "tokio-socks", "tokio-tungstenite", "tor-hsrproxy", - "tor-hsservice", - "tor-rtcompat", + "tor-hsservice 0.22.0", + "tor-rtcompat 0.22.0", "url", "wasm-bindgen", "web-sys", @@ -356,6 +395,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2225b558afc76c596898f5f1b3fc35cfce0eb1b13635cbd7d1b2a7177dc10ccd" +[[package]] +name = "bstr" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" +dependencies = [ + "memchr", + "regex-automata 0.4.7", + "serde", +] + [[package]] name = "bumpalo" version = "3.16.0" @@ -392,6 +442,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c979a125c4d00f63d49b648530a952c6cc42e3387cc96f41f9a4687ee6b9273" +[[package]] +name = "caret" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df55dc0c84d5a555c4b8b84ecf3cff724df77a7b1a8c4a70cd66a981524cff0" + [[package]] name = "cc" version = "1.1.21" @@ -463,6 +519,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie-factory" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -647,6 +721,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs", + "cookie-factory", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", +] + [[package]] name = "deranged" version = "0.3.11" @@ -749,13 +837,35 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", "syn 2.0.77", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.77", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -1022,7 +1132,23 @@ dependencies = [ "dirs", "libc", "once_cell", - "pwd-grp", + "pwd-grp 0.1.1", + "serde", + "thiserror", + "walkdir", +] + +[[package]] +name = "fs-mistrust" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12a327e6e1ee5595f66105852c644a2d65dfbc62c30c90f53a2783d270002de" +dependencies = [ + "derive_builder_fork_arti", + "dirs", + "libc", + "once_cell", + "pwd-grp 1.0.0", "serde", "thiserror", "walkdir", @@ -1059,6 +1185,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "fslock-guard" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0ec6829d66d94dd25e4dba799d0c2843356af12b28b41b455086eb1871d67d" +dependencies = [ + "fslock-arti-fork", + "thiserror", + "winapi", +] + [[package]] name = "funty" version = "2.0.0" @@ -1419,6 +1556,17 @@ dependencies = [ "libc", ] +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + [[package]] name = "inotify-sys" version = "0.1.5" @@ -1437,6 +1585,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + [[package]] name = "inventory" version = "0.3.15" @@ -1549,9 +1706,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -1610,6 +1767,12 @@ dependencies = [ "zeroize", ] +[[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.8.0" @@ -1639,10 +1802,21 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", + "log", "wasi", "windows-sys 0.52.0", ] +[[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 = "notify" version = "6.1.1" @@ -1651,7 +1825,7 @@ checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ "bitflags 2.6.0", "filetime", - "inotify", + "inotify 0.9.6", "kqueue", "libc", "log", @@ -1660,6 +1834,33 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "notify" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" +dependencies = [ + "bitflags 2.6.0", + "filetime", + "inotify 0.10.2", + "kqueue", + "libc", + "log", + "mio 1.0.2", + "notify-types", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "notify-types" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df" +dependencies = [ + "instant", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1778,6 +1979,15 @@ dependencies = [ "futures", ] +[[package]] +name = "oneshot-fused-workaround" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f49cbc8293c5ba37516d29aba392a94a34638367d17d67617cea34e4f9acd05" +dependencies = [ + "futures", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -1793,6 +2003,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +dependencies = [ + "memchr", +] + [[package]] name = "overload" version = "0.1.1" @@ -2078,6 +2297,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "pwd-grp" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b94fdf3867b7f2889a736f0022ea9386766280d2cca4bdbe41629ada9e4f3b8f" +dependencies = [ + "derive-deftly", + "libc", + "paste", + "thiserror", +] + [[package]] name = "quote" version = "1.0.37" @@ -2199,6 +2430,12 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeb501c6079c6e2a1c9761b76ddb12ecb6818b8773748f5e0394b95f838e4a38" +[[package]] +name = "retry-error" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ef93545b13f6dd83a9f98c8a656ccbd7bc2b95a747844346c70f7e6f5a5932" + [[package]] name = "rfc6979" version = "0.4.0" @@ -2262,9 +2499,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ "bitflags 2.6.0", "fallible-iterator", @@ -2290,6 +2527,15 @@ dependencies = [ "semver", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustls" version = "0.23.19" @@ -2340,7 +2586,20 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cabd7492c13678058e680f161cf94ba34d9d9e48419d1fbc6c21a32926c23764" dependencies = [ - "derive_more", + "derive_more 0.99.18", + "educe", + "either", + "fluid-let", + "thiserror", +] + +[[package]] +name = "safelog" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d00c331d3dad51d67db003b70b4e1ab8408c5b89f5830af4d282e612a75a84f3" +dependencies = [ + "derive_more 1.0.0", "educe", "either", "fluid-let", @@ -2538,7 +2797,9 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ + "bstr", "dirs", + "os_str_bytes", ] [[package]] @@ -2599,9 +2860,23 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ + "serde", "version_check", ] +[[package]] +name = "slotmap-careful" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0521c412b8940cf10d63e88faa7b63839ced20547e6d49d86417d90d0c1af8ad" +dependencies = [ + "paste", + "serde", + "slotmap", + "thiserror", + "void", +] + [[package]] name = "smallvec" version = "1.13.2" @@ -2771,6 +3046,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "tap" version = "1.0.1" @@ -2996,9 +3282,25 @@ checksum = "8c008067156c51d6485b621d92e46ed8db544a6ad59b984b25e3686b73f086ea" dependencies = [ "educe", "futures", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.1.0", + "pin-project", + "postage", + "void", +] + +[[package]] +name = "tor-async-utils" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3157a36bca68d25da943d9e77804fb1dadca108cd124871668a18763eae735b6" +dependencies = [ + "derive-deftly", + "educe", + "futures", + "oneshot-fused-workaround 0.2.0", "pin-project", "postage", + "thiserror", "void", ] @@ -3008,14 +3310,33 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f79d747dd7d631495c45e074250fad13cd83f9c751bc25fc3be5c9ca9b820a63" dependencies = [ - "derive_more", + "derive_more 0.99.18", + "hex", + "itertools 0.13.0", + "libc", + "paste", + "rand", + "rand_chacha", + "slab", + "thiserror", +] + +[[package]] +name = "tor-basic-utils" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3915f18c6574f797c5d59089074f79f81e6d93495d726179eebc9084126d617e" +dependencies = [ + "derive_more 1.0.0", "hex", "itertools 0.13.0", "libc", "paste", "rand", "rand_chacha", + "serde", "slab", + "smallvec", "thiserror", ] @@ -3030,34 +3351,81 @@ dependencies = [ "educe", "getrandom", "thiserror", - "tor-error", - "tor-llcrypto", + "tor-error 0.22.0", + "tor-llcrypto 0.22.0", "zeroize", ] [[package]] -name = "tor-cell" -version = "0.22.0" +name = "tor-bytes" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a0ef0674d08e4ec1e7a6a8e0129784379463c72406aca987e82fdea9f4f0fd" +checksum = "f6cef6d87b08baf1475bc24da39343705ab9b4f7f916d0ee19fa657634733d0d" dependencies = [ - "bitflags 2.6.0", "bytes", - "caret", - "derive_more", + "derive-deftly", + "digest", "educe", - "paste", - "rand", + "getrandom", + "safelog 0.4.1", + "thiserror", + "tor-error 0.24.0", + "tor-llcrypto 0.24.0", + "zeroize", +] + +[[package]] +name = "tor-cell" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31a0ef0674d08e4ec1e7a6a8e0129784379463c72406aca987e82fdea9f4f0fd" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "caret 0.4.7", + "derive_more 0.99.18", + "educe", + "paste", + "rand", + "smallvec", + "thiserror", + "tor-basic-utils 0.22.0", + "tor-bytes 0.22.0", + "tor-cert 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-units 0.22.0", +] + +[[package]] +name = "tor-cell" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35443109312b7ea355d767afc696d00389604a6afa6144a44ba074f7290bbb6b" +dependencies = [ + "amplify", + "bitflags 2.6.0", + "bytes", + "caret 0.5.0", + "derive-deftly", + "derive_more 1.0.0", + "educe", + "paste", + "rand", "smallvec", "thiserror", - "tor-basic-utils", - "tor-bytes", - "tor-cert", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-units", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-cert 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-memquota", + "tor-units 0.24.0", + "void", ] [[package]] @@ -3066,14 +3434,30 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bb3afa49a44e1610c03b6142337ba0c4de1a6d70aea59849878de8876099930" dependencies = [ - "caret", + "caret 0.4.7", + "derive_builder_fork_arti", + "derive_more 0.99.18", + "digest", + "thiserror", + "tor-bytes 0.22.0", + "tor-checkable 0.22.0", + "tor-llcrypto 0.22.0", +] + +[[package]] +name = "tor-cert" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b8eaa55aa20a3cab77943e176ed48f34c90d9ba0dc98c64adef6c15aef0bc8" +dependencies = [ + "caret 0.5.0", "derive_builder_fork_arti", - "derive_more", + "derive_more 1.0.0", "digest", "thiserror", - "tor-bytes", - "tor-checkable", - "tor-llcrypto", + "tor-bytes 0.24.0", + "tor-checkable 0.24.0", + "tor-llcrypto 0.24.0", ] [[package]] @@ -3084,27 +3468,61 @@ checksum = "94fe321a802b53627477ca6f07c4660390d1f62c116a1aeb7ab943666bbbb1e6" dependencies = [ "async-trait", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", + "educe", + "futures", + "oneshot-fused-workaround 0.1.0", + "postage", + "rand", + "safelog 0.3.8", + "serde", + "thiserror", + "tor-async-utils 0.22.0", + "tor-basic-utils 0.22.0", + "tor-cell 0.22.0", + "tor-config 0.22.0", + "tor-error 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-netdir 0.22.0", + "tor-proto 0.22.0", + "tor-rtcompat 0.22.0", + "tor-socksproto 0.22.0", + "tor-units 0.22.0", + "tracing", + "void", +] + +[[package]] +name = "tor-chanmgr" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0eabe776706c7062468bb7fdab05136c7a9db6325e9688e02d47a7b6d6dee9d" +dependencies = [ + "async-trait", + "derive_builder_fork_arti", + "derive_more 1.0.0", "educe", "futures", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "postage", "rand", - "safelog", + "safelog 0.4.1", "serde", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-cell", - "tor-config", - "tor-error", - "tor-linkspec", - "tor-llcrypto", - "tor-netdir", - "tor-proto", - "tor-rtcompat", - "tor-socksproto", - "tor-units", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-cell 0.24.0", + "tor-config 0.24.0", + "tor-error 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-memquota", + "tor-netdir 0.24.0", + "tor-proto 0.24.0", + "tor-rtcompat 0.24.0", + "tor-socksproto 0.24.0", + "tor-units 0.24.0", "tracing", "void", ] @@ -3118,7 +3536,19 @@ dependencies = [ "humantime", "signature", "thiserror", - "tor-llcrypto", + "tor-llcrypto 0.22.0", +] + +[[package]] +name = "tor-checkable" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c1d164cf835d4f5e4150293e8322e152e8d8a39839cfea219742556df8fbe2" +dependencies = [ + "humantime", + "signature", + "thiserror", + "tor-llcrypto 0.24.0", ] [[package]] @@ -3132,7 +3562,53 @@ dependencies = [ "bounded-vec-deque", "cfg-if", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", + "downcast-rs", + "dyn-clone", + "educe", + "futures", + "humantime-serde", + "itertools 0.13.0", + "once_cell", + "oneshot-fused-workaround 0.1.0", + "pin-project", + "rand", + "retry-error 0.5.4", + "safelog 0.3.8", + "serde", + "static_assertions", + "thiserror", + "tor-async-utils 0.22.0", + "tor-basic-utils 0.22.0", + "tor-chanmgr 0.22.0", + "tor-config 0.22.0", + "tor-error 0.22.0", + "tor-guardmgr 0.22.0", + "tor-linkspec 0.22.0", + "tor-netdir 0.22.0", + "tor-netdoc 0.22.0", + "tor-persist 0.22.0", + "tor-proto 0.22.0", + "tor-protover 0.22.0", + "tor-relay-selection 0.22.0", + "tor-rtcompat 0.22.0", + "tracing", + "void", + "weak-table", +] + +[[package]] +name = "tor-circmgr" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24638de4d36226023345c0e5f40e0e2244d2f6aec118b9c7cdb464c8f5f6277" +dependencies = [ + "amplify", + "async-trait", + "bounded-vec-deque", + "cfg-if", + "derive_builder_fork_arti", + "derive_more 1.0.0", "downcast-rs", "dyn-clone", "educe", @@ -3140,28 +3616,29 @@ dependencies = [ "humantime-serde", "itertools 0.13.0", "once_cell", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "pin-project", "rand", - "retry-error", - "safelog", + "retry-error 0.6.0", + "safelog 0.4.1", "serde", "static_assertions", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-chanmgr", - "tor-config", - "tor-error", - "tor-guardmgr", - "tor-linkspec", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-protover", - "tor-relay-selection", - "tor-rtcompat", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-chanmgr 0.24.0", + "tor-config 0.24.0", + "tor-error 0.24.0", + "tor-guardmgr 0.24.0", + "tor-linkspec 0.24.0", + "tor-memquota", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", + "tor-persist 0.24.0", + "tor-proto 0.24.0", + "tor-protover 0.24.0", + "tor-relay-selection 0.24.0", + "tor-rtcompat 0.24.0", "tracing", "void", "weak-table", @@ -3180,10 +3657,46 @@ dependencies = [ "educe", "either", "figment", - "fs-mistrust", + "fs-mistrust 0.7.13", + "futures", + "itertools 0.13.0", + "notify 6.1.1", + "once_cell", + "paste", + "postage", + "regex", + "serde", + "serde-value", + "serde_ignored", + "shellexpand", + "strum 0.26.3", + "thiserror", + "toml", + "tor-basic-utils 0.22.0", + "tor-error 0.22.0", + "tor-rtcompat 0.22.0", + "tracing", + "void", +] + +[[package]] +name = "tor-config" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16a89f7cc30d911d5baf61a181b15ea16219d5a63b54ff87bd3e05d3814ad212" +dependencies = [ + "amplify", + "cfg-if", + "derive-deftly", + "derive_builder_fork_arti", + "directories", + "educe", + "either", + "figment", + "fs-mistrust 0.8.1", "futures", "itertools 0.13.0", - "notify", + "notify 7.0.0", "once_cell", "paste", "postage", @@ -3195,23 +3708,38 @@ dependencies = [ "strum 0.26.3", "thiserror", "toml", - "tor-basic-utils", - "tor-error", - "tor-rtcompat", + "tor-basic-utils 0.24.0", + "tor-config-path", + "tor-error 0.24.0", + "tor-rtcompat 0.24.0", "tracing", "void", ] +[[package]] +name = "tor-config-path" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebee676fe2b0c76c262e107a11a996cb381ff484d136c218becea6a4c15be5a" +dependencies = [ + "directories", + "once_cell", + "serde", + "shellexpand", + "thiserror", + "tor-error 0.24.0", +] + [[package]] name = "tor-consdiff" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aac77a0ec434b8ffeb1d67618e4dd0aeb1abd723ed5a34542575482b3dec1fc" +checksum = "01fd67886ae74b82d4cf7a15bc34c7381d10287178b3f9e8d92311cb74b761b1" dependencies = [ "digest", "hex", "thiserror", - "tor-llcrypto", + "tor-llcrypto 0.24.0", ] [[package]] @@ -3222,7 +3750,7 @@ checksum = "6c13767a064e9f0d17f6aaa307218d04abd5b770f042d167df39d6dd96311960" dependencies = [ "async-compression", "base64ct", - "derive_more", + "derive_more 0.99.18", "futures", "hex", "http", @@ -3231,31 +3759,59 @@ dependencies = [ "itertools 0.13.0", "memchr", "thiserror", - "tor-circmgr", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-netdoc", - "tor-proto", - "tor-rtcompat", + "tor-circmgr 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-netdoc 0.22.0", + "tor-proto 0.22.0", + "tor-rtcompat 0.22.0", + "tracing", +] + +[[package]] +name = "tor-dirclient" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a65ac0b04c4ff8c303a291ab22aa453c73929895b16a8314d888a7d0269c8343" +dependencies = [ + "async-compression", + "base64ct", + "derive_more 1.0.0", + "futures", + "hex", + "http", + "httparse", + "httpdate", + "itertools 0.13.0", + "memchr", + "thiserror", + "tor-circmgr 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-netdoc 0.24.0", + "tor-proto 0.24.0", + "tor-rtcompat 0.24.0", "tracing", ] [[package]] name = "tor-dirmgr" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10788702ecc5ef2dc02292e36182732703bd2d3b497168a30bd29a19647f7f3c" +checksum = "b3a3e12af4860040f28cb14b03f9fae18a9aa0f1e66dab77ef0d9f93026ba95b" dependencies = [ "async-trait", "base64ct", "derive_builder_fork_arti", - "derive_more", + "derive_more 1.0.0", "digest", "educe", "event-listener", - "fs-mistrust", + "fs-mistrust 0.8.1", "fslock", "futures", "hex", @@ -3264,33 +3820,33 @@ dependencies = [ "itertools 0.13.0", "memmap2", "once_cell", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "paste", "postage", "rand", "rusqlite", - "safelog", + "safelog 0.4.1", "scopeguard", "serde", "signature", "strum 0.26.3", "thiserror", "time", - "tor-async-utils", - "tor-basic-utils", - "tor-checkable", - "tor-circmgr", - "tor-config", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-checkable 0.24.0", + "tor-circmgr 0.24.0", + "tor-config 0.24.0", "tor-consdiff", - "tor-dirclient", - "tor-error", - "tor-guardmgr", - "tor-llcrypto", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-rtcompat", + "tor-dirclient 0.24.0", + "tor-error 0.24.0", + "tor-guardmgr 0.24.0", + "tor-llcrypto 0.24.0", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", + "tor-persist 0.24.0", + "tor-proto 0.24.0", + "tor-rtcompat 0.24.0", "tracing", ] @@ -3300,11 +3856,11 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b3edc77493f64b7876a234e6d259ab209ec8d57e57ee9ed789b5e6047e2265e" dependencies = [ - "derive_more", + "derive_more 0.99.18", "futures", "once_cell", "paste", - "retry-error", + "retry-error 0.5.4", "static_assertions", "strum 0.26.3", "thiserror", @@ -3312,6 +3868,35 @@ dependencies = [ "void", ] +[[package]] +name = "tor-error" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82249e99eeab846b0264aabb761bceba891b9a5e5875fd2644683feeb96ea417" +dependencies = [ + "derive_more 1.0.0", + "futures", + "once_cell", + "paste", + "retry-error 0.6.0", + "static_assertions", + "strum 0.26.3", + "thiserror", + "tracing", + "void", +] + +[[package]] +name = "tor-general-addr" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3279be11b11750ea2bb85cc6ac81f22223696650400834d8e64c9449136b593e" +dependencies = [ + "derive_more 1.0.0", + "thiserror", + "void", +] + [[package]] name = "tor-guardmgr" version = "0.22.0" @@ -3322,7 +3907,49 @@ dependencies = [ "base64ct", "derive-deftly", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", + "dyn-clone", + "educe", + "futures", + "humantime", + "humantime-serde", + "itertools 0.13.0", + "num_enum", + "oneshot-fused-workaround 0.1.0", + "pin-project", + "postage", + "rand", + "safelog 0.3.8", + "serde", + "strum 0.26.3", + "thiserror", + "tor-async-utils 0.22.0", + "tor-basic-utils 0.22.0", + "tor-config 0.22.0", + "tor-error 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-netdir 0.22.0", + "tor-netdoc 0.22.0", + "tor-persist 0.22.0", + "tor-proto 0.22.0", + "tor-relay-selection 0.22.0", + "tor-rtcompat 0.22.0", + "tor-units 0.22.0", + "tracing", +] + +[[package]] +name = "tor-guardmgr" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a732a0331e57b852512dcba2e2cecac1b7e9aee91e231b1d7373f8d6ca4aa1a" +dependencies = [ + "amplify", + "base64ct", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more 1.0.0", "dyn-clone", "educe", "futures", @@ -3330,69 +3957,70 @@ dependencies = [ "humantime-serde", "itertools 0.13.0", "num_enum", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "pin-project", "postage", "rand", - "safelog", + "safelog 0.4.1", "serde", "strum 0.26.3", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-config", - "tor-error", - "tor-linkspec", - "tor-llcrypto", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-relay-selection", - "tor-rtcompat", - "tor-units", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-config 0.24.0", + "tor-error 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", + "tor-persist 0.24.0", + "tor-proto 0.24.0", + "tor-relay-selection 0.24.0", + "tor-rtcompat 0.24.0", + "tor-units 0.24.0", "tracing", ] [[package]] name = "tor-hsclient" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec233600388692f5b0c86304e446c1c5928d5389a4c1e9a458b9b3c9d2b0f1" +checksum = "0ac236cd5ea5e96590e10adaf71cb0f48678d24da59b724b9cc7cfa552a14ba0" dependencies = [ "async-trait", "derive-deftly", - "derive_more", + "derive_more 1.0.0", "educe", "either", "futures", "itertools 0.13.0", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "postage", "rand", - "retry-error", - "safelog", - "slotmap", + "retry-error 0.6.0", + "safelog 0.4.1", + "slotmap-careful", "strum 0.26.3", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-checkable", - "tor-circmgr", - "tor-config", - "tor-dirclient", - "tor-error", - "tor-hscrypto", - "tor-keymgr", - "tor-linkspec", - "tor-llcrypto", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-rtcompat", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-cell 0.24.0", + "tor-checkable 0.24.0", + "tor-circmgr 0.24.0", + "tor-config 0.24.0", + "tor-dirclient 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-keymgr 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-memquota", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", + "tor-persist 0.24.0", + "tor-proto 0.24.0", + "tor-rtcompat 0.24.0", "tracing", ] @@ -3404,20 +4032,48 @@ checksum = "3db824b336c082804882221188097f73bcd8f551da2f56144c7b560c971f44f9" dependencies = [ "cipher", "data-encoding", - "derive_more", + "derive_more 0.99.18", + "digest", + "itertools 0.13.0", + "paste", + "rand", + "safelog 0.3.8", + "signature", + "subtle", + "thiserror", + "tor-basic-utils 0.22.0", + "tor-bytes 0.22.0", + "tor-error 0.22.0", + "tor-llcrypto 0.22.0", + "tor-units 0.22.0", + "zeroize", +] + +[[package]] +name = "tor-hscrypto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00099189e52d3376082b58139759249f16a53119d3d4f5f023168881c87d0a0" +dependencies = [ + "cipher", + "data-encoding", + "derive-deftly", + "derive_more 1.0.0", "digest", "itertools 0.13.0", "paste", "rand", - "safelog", + "safelog 0.4.1", "signature", "subtle", "thiserror", - "tor-basic-utils", - "tor-bytes", - "tor-error", - "tor-llcrypto", - "tor-units", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-error 0.24.0", + "tor-llcrypto 0.24.0", + "tor-memquota", + "tor-units 0.24.0", + "void", "zeroize", ] @@ -3430,20 +4086,20 @@ dependencies = [ "derive-deftly", "derive_builder_fork_arti", "futures", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.1.0", "rangemap", - "safelog", + "safelog 0.3.8", "serde", "serde_with", "thiserror", - "tor-async-utils", - "tor-cell", - "tor-config", - "tor-error", - "tor-hsservice", - "tor-log-ratelim", - "tor-proto", - "tor-rtcompat", + "tor-async-utils 0.22.0", + "tor-cell 0.22.0", + "tor-config 0.22.0", + "tor-error 0.22.0", + "tor-hsservice 0.22.0", + "tor-log-ratelim 0.22.0", + "tor-proto 0.22.0", + "tor-rtcompat 0.22.0", "tracing", "void", ] @@ -3460,10 +4116,10 @@ dependencies = [ "cfg-if", "derive-deftly", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", "digest", "educe", - "fs-mistrust", + "fs-mistrust 0.7.13", "futures", "growable-bloom-filter", "hex", @@ -3471,40 +4127,116 @@ dependencies = [ "itertools 0.13.0", "k12", "once_cell", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.1.0", "postage", "rand", "rand_core", - "retry-error", - "safelog", + "retry-error 0.5.4", + "safelog 0.3.8", "serde", "serde_with", "strum 0.26.3", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-circmgr", - "tor-config", - "tor-dirclient", - "tor-error", - "tor-hscrypto", - "tor-keymgr", - "tor-linkspec", - "tor-llcrypto", - "tor-log-ratelim", - "tor-netdir", - "tor-netdoc", - "tor-persist", - "tor-proto", - "tor-protover", - "tor-relay-selection", - "tor-rtcompat", + "tor-async-utils 0.22.0", + "tor-basic-utils 0.22.0", + "tor-bytes 0.22.0", + "tor-cell 0.22.0", + "tor-circmgr 0.22.0", + "tor-config 0.22.0", + "tor-dirclient 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-keymgr 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-log-ratelim 0.22.0", + "tor-netdir 0.22.0", + "tor-netdoc 0.22.0", + "tor-persist 0.22.0", + "tor-proto 0.22.0", + "tor-protover 0.22.0", + "tor-relay-selection 0.22.0", + "tor-rtcompat 0.22.0", "tracing", "void", ] +[[package]] +name = "tor-hsservice" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eaf9ac91fff7b5e009da2a4c88b34db4ee8d6416a8cd2907659e715641169bd" +dependencies = [ + "amplify", + "async-trait", + "base64ct", + "cfg-if", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more 1.0.0", + "digest", + "educe", + "fs-mistrust 0.8.1", + "futures", + "growable-bloom-filter", + "hex", + "humantime", + "itertools 0.13.0", + "k12", + "once_cell", + "oneshot-fused-workaround 0.2.0", + "postage", + "rand", + "rand_core", + "retry-error 0.6.0", + "safelog 0.4.1", + "serde", + "serde_with", + "strum 0.26.3", + "thiserror", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-cell 0.24.0", + "tor-circmgr 0.24.0", + "tor-config 0.24.0", + "tor-dirclient 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-keymgr 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-log-ratelim 0.24.0", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", + "tor-persist 0.24.0", + "tor-proto 0.24.0", + "tor-protover 0.24.0", + "tor-relay-selection 0.24.0", + "tor-rtcompat 0.24.0", + "tracing", + "void", +] + +[[package]] +name = "tor-key-forge" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "814a3ceb5b1c0a790f3604f2745775ca4a2cac3499a00c8641fc03030e068e08" +dependencies = [ + "derive-deftly", + "derive_more 1.0.0", + "downcast-rs", + "paste", + "rand", + "signature", + "ssh-key", + "thiserror", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-llcrypto 0.24.0", +] + [[package]] name = "tor-keymgr" version = "0.22.0" @@ -3515,10 +4247,10 @@ dependencies = [ "arrayvec", "derive-deftly", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", "downcast-rs", "dyn-clone", - "fs-mistrust", + "fs-mistrust 0.7.13", "glob-match", "humantime", "inventory", @@ -3527,40 +4259,103 @@ dependencies = [ "serde", "ssh-key", "thiserror", - "tor-basic-utils", - "tor-config", - "tor-error", - "tor-hscrypto", - "tor-llcrypto", - "tor-persist", - "walkdir", - "zeroize", + "tor-basic-utils 0.22.0", + "tor-config 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-llcrypto 0.22.0", + "tor-persist 0.22.0", + "walkdir", + "zeroize", +] + +[[package]] +name = "tor-keymgr" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335a589e149aa728b09c1614a76f9857993c133c2b0fa03319c41218f4bde975" +dependencies = [ + "amplify", + "arrayvec", + "cfg-if", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more 1.0.0", + "downcast-rs", + "dyn-clone", + "fs-mistrust 0.8.1", + "glob-match", + "humantime", + "inventory", + "itertools 0.13.0", + "rand", + "serde", + "signature", + "ssh-key", + "thiserror", + "tor-basic-utils 0.24.0", + "tor-config 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-key-forge", + "tor-llcrypto 0.24.0", + "tor-persist 0.24.0", + "tracing", + "walkdir", + "zeroize", +] + +[[package]] +name = "tor-linkspec" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79554ce76d519f909a5bba8beea6b2187c4ba131a717944258dce7fcec235a8f" +dependencies = [ + "base64ct", + "by_address", + "caret 0.4.7", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more 0.99.18", + "hex", + "itertools 0.13.0", + "safelog 0.3.8", + "serde", + "serde_with", + "strum 0.26.3", + "thiserror", + "tor-basic-utils 0.22.0", + "tor-bytes 0.22.0", + "tor-config 0.22.0", + "tor-llcrypto 0.22.0", + "tor-protover 0.22.0", ] [[package]] name = "tor-linkspec" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79554ce76d519f909a5bba8beea6b2187c4ba131a717944258dce7fcec235a8f" +checksum = "cc92002b84c1cdea158aac4a3a400d61dd02fae5d9d0e8a36a8e08cd64fda6e9" dependencies = [ "base64ct", "by_address", - "caret", + "caret 0.5.0", "derive-deftly", "derive_builder_fork_arti", - "derive_more", + "derive_more 1.0.0", "hex", "itertools 0.13.0", - "safelog", + "safelog 0.4.1", "serde", "serde_with", "strum 0.26.3", "thiserror", - "tor-basic-utils", - "tor-bytes", - "tor-config", - "tor-llcrypto", - "tor-protover", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-config 0.24.0", + "tor-llcrypto 0.24.0", + "tor-memquota", + "tor-protover 0.24.0", ] [[package]] @@ -3573,7 +4368,7 @@ dependencies = [ "base64ct", "ctr", "curve25519-dalek", - "derive_more", + "derive_more 0.99.18", "digest", "ed25519-dalek", "educe", @@ -3581,7 +4376,7 @@ dependencies = [ "hex", "rand_core", "rsa", - "safelog", + "safelog 0.3.8", "serde", "sha1", "sha2", @@ -3595,6 +4390,40 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tor-llcrypto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877d2fae2ef8f29ad91bd434e195bdef98662839be9ed4befdf071956b093123" +dependencies = [ + "aes", + "base64ct", + "ctr", + "curve25519-dalek", + "der-parser", + "derive-deftly", + "derive_more 1.0.0", + "digest", + "ed25519-dalek", + "educe", + "getrandom", + "hex", + "rand_core", + "rsa", + "safelog 0.4.1", + "serde", + "sha1", + "sha2", + "sha3", + "signature", + "subtle", + "thiserror", + "tor-memquota", + "visibility", + "x25519-dalek", + "zeroize", +] + [[package]] name = "tor-log-ratelim" version = "0.22.0" @@ -3605,12 +4434,56 @@ dependencies = [ "humantime", "once_cell", "thiserror", - "tor-error", - "tor-rtcompat", + "tor-error 0.22.0", + "tor-rtcompat 0.22.0", + "tracing", + "weak-table", +] + +[[package]] +name = "tor-log-ratelim" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b090937d1bde6910769b2be6b514fc1c07e83f646a14a471f8f2647367afd10" +dependencies = [ + "futures", + "humantime", + "once_cell", + "thiserror", + "tor-error 0.24.0", + "tor-rtcompat 0.24.0", "tracing", "weak-table", ] +[[package]] +name = "tor-memquota" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4560cc9485af7c499f611e2ed565dfcf1445e804faad0dd47ad097f4e9bf7d2" +dependencies = [ + "derive-deftly", + "derive_more 1.0.0", + "dyn-clone", + "educe", + "futures", + "itertools 0.13.0", + "paste", + "pin-project", + "serde", + "slotmap-careful", + "static_assertions", + "thiserror", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-config 0.24.0", + "tor-error 0.24.0", + "tor-log-ratelim 0.24.0", + "tor-rtcompat 0.24.0", + "tracing", + "void", +] + [[package]] name = "tor-netdir" version = "0.22.0" @@ -3618,7 +4491,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f493e5c390efa9625d5f44d0f33743fede0ff47bc1e4fada640a44e13004c963" dependencies = [ "bitflags 2.6.0", - "derive_more", + "derive_more 0.99.18", + "digest", + "futures", + "hex", + "humantime", + "itertools 0.13.0", + "num_enum", + "rand", + "serde", + "static_assertions", + "strum 0.26.3", + "thiserror", + "time", + "tor-basic-utils 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-netdoc 0.22.0", + "tor-protover 0.22.0", + "tor-units 0.22.0", + "tracing", + "typed-index-collections", +] + +[[package]] +name = "tor-netdir" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a99ad35659954aa280e678c3af2ab68934caaf55b94b947e2fb6f850598b5a" +dependencies = [ + "bitflags 2.6.0", + "derive_more 1.0.0", "digest", "futures", "hex", @@ -3631,14 +4536,14 @@ dependencies = [ "strum 0.26.3", "thiserror", "time", - "tor-basic-utils", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-netdoc", - "tor-protover", - "tor-units", + "tor-basic-utils 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-netdoc 0.24.0", + "tor-protover 0.24.0", + "tor-units 0.24.0", "tracing", "typed-index-collections", ] @@ -3654,7 +4559,51 @@ dependencies = [ "bitflags 2.6.0", "cipher", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", + "digest", + "educe", + "hex", + "humantime", + "itertools 0.13.0", + "once_cell", + "phf", + "rand", + "serde", + "serde_with", + "signature", + "smallvec", + "subtle", + "thiserror", + "time", + "tinystr", + "tor-basic-utils 0.22.0", + "tor-bytes 0.22.0", + "tor-cell 0.22.0", + "tor-cert 0.22.0", + "tor-checkable 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-protover 0.22.0", + "tor-units 0.22.0", + "void", + "weak-table", + "zeroize", +] + +[[package]] +name = "tor-netdoc" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f74630f9b13b192e84e09a0b39460eec8d1d23f6fa4b45f03d06782322d583fb" +dependencies = [ + "amplify", + "base64ct", + "bitflags 2.6.0", + "cipher", + "derive_builder_fork_arti", + "derive_more 1.0.0", "digest", "educe", "hex", @@ -3671,17 +4620,17 @@ dependencies = [ "thiserror", "time", "tinystr", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-cert", - "tor-checkable", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-protover", - "tor-units", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-cell 0.24.0", + "tor-cert 0.24.0", + "tor-checkable 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-protover 0.24.0", + "tor-units 0.24.0", "void", "weak-table", "zeroize", @@ -3695,22 +4644,50 @@ checksum = "38b7942bb43a51129ae4e84124e82e48f96e453a6fb8381c5c2b23899116d411" dependencies = [ "amplify", "derive-deftly", - "derive_more", + "derive_more 0.99.18", + "filetime", + "fs-mistrust 0.7.13", + "fslock", + "fslock-guard 0.1.5", + "futures", + "itertools 0.13.0", + "oneshot-fused-workaround 0.1.0", + "paste", + "sanitize-filename", + "serde", + "serde_json", + "thiserror", + "tor-async-utils 0.22.0", + "tor-basic-utils 0.22.0", + "tor-error 0.22.0", + "tracing", + "void", +] + +[[package]] +name = "tor-persist" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b035192b529f6316c77d969f1e3be9f85d61ca1e1f946c91a96f987fdaba5e" +dependencies = [ + "amplify", + "derive-deftly", + "derive_more 1.0.0", "filetime", - "fs-mistrust", + "fs-mistrust 0.8.1", "fslock", - "fslock-guard", + "fslock-guard 0.2.0", "futures", "itertools 0.13.0", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "paste", "sanitize-filename", "serde", "serde_json", "thiserror", - "tor-async-utils", - "tor-basic-utils", - "tor-error", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-error 0.24.0", "tracing", "void", ] @@ -3727,36 +4704,85 @@ dependencies = [ "cipher", "coarsetime", "derive_builder_fork_arti", - "derive_more", + "derive_more 0.99.18", + "digest", + "educe", + "futures", + "hkdf", + "hmac", + "oneshot-fused-workaround 0.1.0", + "pin-project", + "rand", + "rand_core", + "safelog 0.3.8", + "subtle", + "thiserror", + "tor-async-utils 0.22.0", + "tor-basic-utils 0.22.0", + "tor-bytes 0.22.0", + "tor-cell 0.22.0", + "tor-cert 0.22.0", + "tor-checkable 0.22.0", + "tor-config 0.22.0", + "tor-error 0.22.0", + "tor-hscrypto 0.22.0", + "tor-linkspec 0.22.0", + "tor-llcrypto 0.22.0", + "tor-log-ratelim 0.22.0", + "tor-rtcompat 0.22.0", + "tor-rtmock 0.22.0", + "tor-units 0.22.0", + "tracing", + "typenum", + "visibility", + "void", + "zeroize", +] + +[[package]] +name = "tor-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c911edb20425cff696606795d80241d4c412293254bd88b8a7a84ed92c3a098" +dependencies = [ + "asynchronous-codec", + "bitvec", + "bytes", + "cipher", + "coarsetime", + "derive-deftly", + "derive_builder_fork_arti", + "derive_more 1.0.0", "digest", "educe", "futures", "hkdf", "hmac", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.2.0", "pin-project", "rand", "rand_core", - "safelog", + "safelog 0.4.1", "subtle", "thiserror", "tokio", "tokio-util", - "tor-async-utils", - "tor-basic-utils", - "tor-bytes", - "tor-cell", - "tor-cert", - "tor-checkable", - "tor-config", - "tor-error", - "tor-hscrypto", - "tor-linkspec", - "tor-llcrypto", - "tor-log-ratelim", - "tor-rtcompat", - "tor-rtmock", - "tor-units", + "tor-async-utils 0.24.0", + "tor-basic-utils 0.24.0", + "tor-bytes 0.24.0", + "tor-cell 0.24.0", + "tor-cert 0.24.0", + "tor-checkable 0.24.0", + "tor-config 0.24.0", + "tor-error 0.24.0", + "tor-hscrypto 0.24.0", + "tor-linkspec 0.24.0", + "tor-llcrypto 0.24.0", + "tor-log-ratelim 0.24.0", + "tor-memquota", + "tor-rtcompat 0.24.0", + "tor-rtmock 0.24.0", + "tor-units 0.24.0", "tracing", "typenum", "visibility", @@ -3770,7 +4796,17 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88cf099c5c91216c7d0a6b2d4c67bb18f0786ad8c8273063d6a45c51b49b40c2" dependencies = [ - "caret", + "caret 0.4.7", + "thiserror", +] + +[[package]] +name = "tor-protover" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bc5e3793a53b21b0c98304ea42e1f0fcab3bb37eca96027f9cb4df90685ba31" +dependencies = [ + "caret 0.5.0", "thiserror", ] @@ -3782,10 +4818,24 @@ checksum = "8c8aa5505d8e938ac9e75b819d803396fe69fb483c991b4495fe4b28d374a89c" dependencies = [ "rand", "serde", - "tor-basic-utils", - "tor-linkspec", - "tor-netdir", - "tor-netdoc", + "tor-basic-utils 0.22.0", + "tor-linkspec 0.22.0", + "tor-netdir 0.22.0", + "tor-netdoc 0.22.0", +] + +[[package]] +name = "tor-relay-selection" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba71ca940e15bb86586c3e0cb98b94b9f63a816ef7e1df6aa59cde1114bf86f" +dependencies = [ + "rand", + "serde", + "tor-basic-utils 0.24.0", + "tor-linkspec 0.24.0", + "tor-netdir 0.24.0", + "tor-netdoc 0.24.0", ] [[package]] @@ -3797,7 +4847,32 @@ dependencies = [ "async-trait", "async_executors", "coarsetime", - "derive_more", + "derive_more 0.99.18", + "educe", + "futures", + "futures-rustls", + "paste", + "pin-project", + "rustls-pki-types", + "thiserror", + "tokio", + "tokio-util", + "tor-error 0.22.0", + "tracing", + "x509-signature", +] + +[[package]] +name = "tor-rtcompat" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d91a0e023078fad1f6c65367efac78dada4c5c9ede7498ce7772f66f3bed15b" +dependencies = [ + "async-trait", + "async_executors", + "coarsetime", + "derive_more 1.0.0", + "dyn-clone", "educe", "futures", "futures-rustls", @@ -3807,8 +4882,10 @@ dependencies = [ "thiserror", "tokio", "tokio-util", - "tor-error", + "tor-error 0.24.0", + "tor-general-addr", "tracing", + "void", "x509-signature", ] @@ -3821,19 +4898,47 @@ dependencies = [ "amplify", "async-trait", "derive-deftly", - "derive_more", + "derive_more 0.99.18", "educe", "futures", "humantime", "itertools 0.13.0", - "oneshot-fused-workaround", + "oneshot-fused-workaround 0.1.0", "pin-project", "priority-queue", "slotmap", "strum 0.26.3", "thiserror", - "tor-error", - "tor-rtcompat", + "tor-error 0.22.0", + "tor-rtcompat 0.22.0", + "tracing", + "tracing-test", + "void", +] + +[[package]] +name = "tor-rtmock" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc825722bcad1dca140540a166e582409b4408ce6fbefd8e08d45264ea99f2" +dependencies = [ + "amplify", + "async-trait", + "derive-deftly", + "derive_more 1.0.0", + "educe", + "futures", + "humantime", + "itertools 0.13.0", + "oneshot-fused-workaround 0.2.0", + "pin-project", + "priority-queue", + "slotmap-careful", + "strum 0.26.3", + "thiserror", + "tor-error 0.24.0", + "tor-general-addr", + "tor-rtcompat 0.24.0", "tracing", "tracing-test", "void", @@ -3845,11 +4950,28 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2ea008c29b34604d49f25540e4d72b3bdce0d1021aa82f85e790262280804f0" dependencies = [ - "caret", + "caret 0.4.7", + "subtle", + "thiserror", + "tor-bytes 0.22.0", + "tor-error 0.22.0", +] + +[[package]] +name = "tor-socksproto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eb7a8c792dd59b63fc25add39982d0509c3a58fe6e40eb2294324bf0d30f364" +dependencies = [ + "amplify", + "caret 0.5.0", + "derive-deftly", + "educe", + "safelog 0.4.1", "subtle", "thiserror", - "tor-bytes", - "tor-error", + "tor-bytes 0.24.0", + "tor-error 0.24.0", ] [[package]] @@ -3858,8 +4980,20 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c549e18390341623fb8ee988b2622d9b8fa11727d66717c9331156f84e54b09d" dependencies = [ - "derive_more", + "derive_more 0.99.18", + "thiserror", +] + +[[package]] +name = "tor-units" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b1660c5ba8d5851d5411be3f9c0ae629e2b4e6e8db655b74f354611e5c18a7" +dependencies = [ + "derive-deftly", + "derive_more 1.0.0", "thiserror", + "tor-memquota", ] [[package]] @@ -4006,6 +5140,18 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "untrusted" version = "0.7.1" diff --git a/Cargo.toml b/Cargo.toml index 2cbdc90..57b137d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ tokio-socks = { version = "0.5", optional = true } tokio-tungstenite = { version = "0.24", features = ["rustls-tls-webpki-roots"] } # TOR deps -arti-client = { version = "0.22", default-features = false, features = ["onion-service-client", "rustls", "static-sqlite", "tokio"], optional = true } +arti-client = { version = "0.24", default-features = false, features = ["onion-service-client", "rustls", "static-sqlite", "tokio"], optional = true } tor-hsservice = { version = "0.22", default-features = false, optional = true } tor-hsrproxy = { version = "0.22", default-features = false, optional = true } tor-rtcompat = { version = "0.22", default-features = false, features = ["rustls", "tokio"], optional = true }