From f1f70f7dca4f8b2ef90bd2bf25518f61d0a5ab02 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Wed, 4 Sep 2024 12:00:09 +0200 Subject: [PATCH] Bump Arti to 1.2.7 --- .reuse/dep5 | 12 + CHANGELOG.md | 4 + example/lib/main.dart | 3 +- .../flutter/generated_plugin_registrant.cc | 4 - .../flutter/generated_plugin_registrant.h | 10 - example/linux/flutter/generated_plugins.cmake | 4 - .../Flutter/GeneratedPluginRegistrant.swift | 4 - example/pubspec.lock | 94 +++--- .../flutter/generated_plugin_registrant.cc | 4 - .../flutter/generated_plugin_registrant.h | 10 - .../windows/flutter/generated_plugins.cmake | 4 - pubspec.yaml | 2 +- rust/Cargo.lock | 301 +++++++++++------- rust/Cargo.toml | 11 +- rust/target/tor.h | 10 - 15 files changed, 258 insertions(+), 219 deletions(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index 9e5eb907..e45f55fa 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -11,6 +11,18 @@ Files: lib/generated* Copyright: 2024 Foundation Devices Inc. License: MIT +Files: example/linux/flutter/generated* +Copyright: 2024 Foundation Devices Inc. +License: MIT + +Files: example/macos/Flutter/Generated* +Copyright: 2024 Foundation Devices Inc. +License: MIT + +Files: example/windows/flutter/generated* +Copyright: 2024 Foundation Devices Inc. +License: MIT + Files: rust/target/* Copyright: 2024 Foundation Devices Inc. License: MIT diff --git a/CHANGELOG.md b/CHANGELOG.md index c3729b01..8de4f47b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ SPDX-FileCopyrightText: 2024 Foundation Devices Inc. SPDX-License-Identifier: MIT --> +## 0.0.8 + +* Bumped arti to version 1.2.7 + ## 0.0.7 * Relicensed to MIT diff --git a/example/lib/main.dart b/example/lib/main.dart index ae09c507..134936de 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -156,8 +156,9 @@ class _MyAppState extends State { ]); // GET request. + final url = Uri.parse(hostController.text); final request = await client - .getUrl(Uri.parse(hostController.text)); + .getUrl(url); final response = await request.close(); // Print response. diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index ee2f5ad3..e71a16d2 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -// -// SPDX-License-Identifier: MIT - // // Generated file. Do not edit. // diff --git a/example/linux/flutter/generated_plugin_registrant.h b/example/linux/flutter/generated_plugin_registrant.h index 58b18bbe..e0f0a47b 100644 --- a/example/linux/flutter/generated_plugin_registrant.h +++ b/example/linux/flutter/generated_plugin_registrant.h @@ -1,13 +1,3 @@ -/* - * SPDX-FileCopyrightText: 2024 Foundation Devices Inc. - * - * SPDX-License-Identifier: MIT - */ - -// SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -// -// SPDX-License-Identifier: MIT - // // Generated file. Do not edit. // diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index fcccede3..3d57782b 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -# -# SPDX-License-Identifier: MIT - # # Generated file, do not edit. # diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 2ca6390f..e777c67d 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -// -// SPDX-License-Identifier: MIT - // // Generated file. Do not edit. // diff --git a/example/pubspec.lock b/example/pubspec.lock index e3dd78bd..3479fa24 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: "direct main" description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" fake_async: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" flutter: dependency: "direct main" description: flutter @@ -83,6 +83,30 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -95,58 +119,58 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.15.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_provider: dependency: transitive description: name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.10" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -167,18 +191,18 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -244,17 +268,17 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" tor: dependency: "direct main" description: path: ".." relative: true source: path - version: "0.0.3" + version: "0.0.7" vector_math: dependency: transitive description: @@ -263,22 +287,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" - win32: + vm_service: dependency: transitive description: - name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + name: vm_service + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "14.2.5" xdg_directories: dependency: transitive description: @@ -288,5 +304,5 @@ packages: source: hosted version: "1.0.4" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc index 805314d9..8b6d4680 100644 --- a/example/windows/flutter/generated_plugin_registrant.cc +++ b/example/windows/flutter/generated_plugin_registrant.cc @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -// -// SPDX-License-Identifier: MIT - // // Generated file. Do not edit. // diff --git a/example/windows/flutter/generated_plugin_registrant.h b/example/windows/flutter/generated_plugin_registrant.h index 250dc6be..dc139d85 100644 --- a/example/windows/flutter/generated_plugin_registrant.h +++ b/example/windows/flutter/generated_plugin_registrant.h @@ -1,13 +1,3 @@ -/* - * SPDX-FileCopyrightText: 2024 Foundation Devices Inc. - * - * SPDX-License-Identifier: MIT - */ - -// SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -// -// SPDX-License-Identifier: MIT - // // Generated file. Do not edit. // diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake index 3f43d56b..8cbe9722 100644 --- a/example/windows/flutter/generated_plugins.cmake +++ b/example/windows/flutter/generated_plugins.cmake @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -# -# SPDX-License-Identifier: MIT - # # Generated file, do not edit. # diff --git a/pubspec.yaml b/pubspec.yaml index 374b96ae..1667a58f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ environment: dependencies: flutter: sdk: flutter - path_provider: ^2.1.1 + path_provider: ^2.1.4 ffi: ^2.0.1 plugin_platform_interface: ^2.0.2 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b17e38a7..6e5fcb43 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -168,13 +168,12 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arti" -version = "1.2.4" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c399f14b316a9b203606877a866a8564907f1ca7b6654a0839f12e8467838d70" +checksum = "1d27dbb88e44809324760b139ee05ce470a38cb030ba41c7187dcb8de3afef0c" dependencies = [ "anyhow", "arti-client", - "backtrace", "cfg-if", "clap 4.4.11", "derive_builder_fork_arti", @@ -183,10 +182,11 @@ dependencies = [ "hickory-proto", "humantime", "humantime-serde", - "itertools 0.12.0", + "itertools 0.13.0", "libc", "notify", "paste", + "postage", "rlimit", "safelog", "secmem-proc", @@ -196,6 +196,7 @@ dependencies = [ "tokio", "tokio-util", "toml 0.8.8", + "tor-async-utils", "tor-config", "tor-error", "tor-rtcompat", @@ -209,9 +210,9 @@ dependencies = [ [[package]] name = "arti-client" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592446097447aac93b3747e366e508e707389a1233ae7674df37864acd065981" +checksum = "7c6c58e0fe132049f6c79c256c8f181df9556cca7fd7e6a5a24f1665151624dd" dependencies = [ "anyhow", "async-trait", @@ -223,9 +224,11 @@ dependencies = [ "fs-mistrust", "futures", "hostname-validator", + "humantime", "humantime-serde", "libc", "postage", + "rand", "safelog", "serde", "thiserror", @@ -294,7 +297,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -422,7 +425,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -557,6 +560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] @@ -572,6 +576,18 @@ dependencies = [ "terminal_size", ] +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -745,7 +761,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -793,7 +809,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -815,7 +831,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -874,9 +890,9 @@ dependencies = [ [[package]] name = "derive-deftly" -version = "0.10.5" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c173dfcd5b92893ab05a8efb18b9522db4db6e0b93db5740f397573c027ce1e" +checksum = "72f9bc3564f74be6c35d49a7efee54380d7946ccc631323067f33fabb9246027" dependencies = [ "derive-deftly-macros", "heck 0.5.0", @@ -884,9 +900,9 @@ dependencies = [ [[package]] name = "derive-deftly-macros" -version = "0.10.5" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216fa20211bcd18cc359b75413bfb6cf89f62568fa27bc5fed3778a7a16e17af" +checksum = "e1b84d32b18d9a256d81e4fec2e4cfd0ab6dde5e5ff49be1713ae0adbd0060c2" dependencies = [ "heck 0.5.0", "indexmap 2.0.0", @@ -896,7 +912,7 @@ dependencies = [ "quote", "sha3", "strum 0.26.3", - "syn 2.0.32", + "syn 2.0.77", "void", ] @@ -994,7 +1010,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -1095,7 +1111,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -1108,7 +1124,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -1342,7 +1358,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -1686,6 +1702,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1999,7 +2024,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -2017,6 +2042,15 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "oneshot-fused-workaround" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f7728ac6298f91a8a364fc9b33b3cfb8bb58c4ef134193dad6e5240739ffe26" +dependencies = [ + "futures", +] + [[package]] name = "openssl" version = "0.10.57" @@ -2040,7 +2074,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -2202,7 +2236,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -2231,7 +2265,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -2338,9 +2372,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2359,9 +2393,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2711,7 +2745,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -2769,7 +2803,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -2989,7 +3023,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -3002,7 +3036,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -3024,9 +3058,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3094,7 +3128,7 @@ checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -3189,7 +3223,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -3262,7 +3296,7 @@ dependencies = [ [[package]] name = "tor" -version = "0.0.6" +version = "0.0.8" dependencies = [ "anyhow", "arti", @@ -3279,11 +3313,13 @@ dependencies = [ [[package]] name = "tor-async-utils" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12afaae386a152b8e82bb6041ab6404b659f198bec7655af301aa3b686d5d81" +checksum = "8c008067156c51d6485b621d92e46ed8db544a6ad59b984b25e3686b73f086ea" dependencies = [ + "educe", "futures", + "oneshot-fused-workaround", "pin-project", "postage", "void", @@ -3291,11 +3327,13 @@ dependencies = [ [[package]] name = "tor-basic-utils" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47792fe0aaac440166bfacc326e418f74b9db821a07f0c5d9d1edc1b9ec39c98" +checksum = "f79d747dd7d631495c45e074250fad13cd83f9c751bc25fc3be5c9ca9b820a63" dependencies = [ + "derive_more", "hex", + "itertools 0.13.0", "libc", "paste", "rand", @@ -3306,9 +3344,9 @@ dependencies = [ [[package]] name = "tor-bytes" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e47fc5f649f4041bdea9d30492aae35205cd53ea8b71be50f9b6130802e82c" +checksum = "9716213e8c95f8db1ae09bf73c8a36770a557eedd7cace5cd02d38af641b06a4" dependencies = [ "bytes", "digest", @@ -3322,9 +3360,9 @@ dependencies = [ [[package]] name = "tor-cell" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e51af4f36e96fe61833a4d94cf50c252a9958c162c0db2fa7a92ee2f0985c3" +checksum = "31a0ef0674d08e4ec1e7a6a8e0129784379463c72406aca987e82fdea9f4f0fd" dependencies = [ "bitflags 2.4.0", "bytes", @@ -3347,9 +3385,9 @@ dependencies = [ [[package]] name = "tor-cert" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b02ff5433d5b4ff6e9779da4886da52b9e458b6435c61a5f804ebfc09a979f1" +checksum = "6bb3afa49a44e1610c03b6142337ba0c4de1a6d70aea59849878de8876099930" dependencies = [ "caret", "derive_more", @@ -3362,15 +3400,16 @@ dependencies = [ [[package]] name = "tor-chanmgr" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffcb97ca0f59f56e765d423564eac7305ed3fc290389341c09df7784d23113bb" +checksum = "94fe321a802b53627477ca6f07c4660390d1f62c116a1aeb7ab943666bbbb1e6" dependencies = [ "async-trait", "derive_builder_fork_arti", "derive_more", "educe", "futures", + "oneshot-fused-workaround", "postage", "rand", "safelog", @@ -3394,9 +3433,9 @@ dependencies = [ [[package]] name = "tor-checkable" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857c0e77022d70040a0d060054fbe368611df203159068f71636b4fa1f517369" +checksum = "d875e93e91977a7c2a1d6ba662d7a3f7d47fcfbad9b93c3a97c2ceb9acf7d29f" dependencies = [ "humantime", "signature", @@ -3406,9 +3445,9 @@ dependencies = [ [[package]] name = "tor-circmgr" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7da3dc69ac9ccc42281f850e34f1ce0999f4b0b84e71de6102298eb17b40c1" +checksum = "4ae5bc3db0f5ce25b183fc6832b9dcdaf50a2a7cef75651150743a51785f6071" dependencies = [ "amplify", "async-trait", @@ -3421,8 +3460,9 @@ dependencies = [ "educe", "futures", "humantime-serde", - "itertools 0.12.0", + "itertools 0.13.0", "once_cell", + "oneshot-fused-workaround", "pin-project", "rand", "retry-error", @@ -3451,10 +3491,11 @@ dependencies = [ [[package]] name = "tor-config" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddf9074373f65d5d9f870c03c95f025e1ca3881d4c41bf68fe3d2dec78b6fb6" +checksum = "47196b7671f195fba0145822455957aa6ad5005e8ed5e3599314842972908232" dependencies = [ + "amplify", "derive-deftly", "derive_builder_fork_arti", "directories", @@ -3462,9 +3503,12 @@ dependencies = [ "either", "figment", "fs-mistrust", - "itertools 0.12.0", + "futures", + "itertools 0.13.0", + "notify", "once_cell", "paste", + "postage", "regex", "serde", "serde-value", @@ -3475,15 +3519,16 @@ dependencies = [ "toml 0.8.8", "tor-basic-utils", "tor-error", + "tor-rtcompat", "tracing", "void", ] [[package]] name = "tor-consdiff" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e023575b1a5187644c089aa1430b57f73f539482ce10cdf32bcd370afc91de08" +checksum = "9aac77a0ec434b8ffeb1d67618e4dd0aeb1abd723ed5a34542575482b3dec1fc" dependencies = [ "digest", "hex", @@ -3493,9 +3538,9 @@ dependencies = [ [[package]] name = "tor-dirclient" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef78cc758514a4fe5a25fbe8c86e93b08f4f9ac69fe48c8ccf62ae0b729b0e" +checksum = "6c13767a064e9f0d17f6aaa307218d04abd5b770f042d167df39d6dd96311960" dependencies = [ "async-compression", "base64ct", @@ -3505,7 +3550,7 @@ dependencies = [ "http", "httparse", "httpdate", - "itertools 0.12.0", + "itertools 0.13.0", "memchr", "thiserror", "tor-circmgr", @@ -3521,9 +3566,9 @@ dependencies = [ [[package]] name = "tor-dirmgr" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7219371bda85128b27c794950f845878e8c351165aade3c01a4efc8d2950a8" +checksum = "10788702ecc5ef2dc02292e36182732703bd2d3b497168a30bd29a19647f7f3c" dependencies = [ "async-trait", "base64ct", @@ -3538,9 +3583,10 @@ dependencies = [ "hex", "humantime", "humantime-serde", - "itertools 0.12.0", + "itertools 0.13.0", "memmap2", "once_cell", + "oneshot-fused-workaround", "paste", "postage", "rand", @@ -3572,11 +3618,10 @@ dependencies = [ [[package]] name = "tor-error" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6478753496321936ebacba91c34375fd79e29bbe9dfc9a3354d5cb211dfbd33b" +checksum = "2b3edc77493f64b7876a234e6d259ab209ec8d57e57ee9ed789b5e6047e2265e" dependencies = [ - "backtrace", "derive_more", "futures", "once_cell", @@ -3586,13 +3631,14 @@ dependencies = [ "strum 0.26.3", "thiserror", "tracing", + "void", ] [[package]] name = "tor-guardmgr" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb523b11abd1c3378f727cfa6cb965ba622c02f8ff356c1b3972f81e084f29b" +checksum = "da216f2d9b279ba65c27f7d5153a01bc002afaa5a7dea3cbd634a4af692736e3" dependencies = [ "amplify", "base64ct", @@ -3604,8 +3650,9 @@ dependencies = [ "futures", "humantime", "humantime-serde", - "itertools 0.12.0", + "itertools 0.13.0", "num_enum", + "oneshot-fused-workaround", "pin-project", "postage", "rand", @@ -3632,9 +3679,9 @@ dependencies = [ [[package]] name = "tor-hsclient" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec01e890aaac65e772a54aaa737d353a501839211da7cf604869c2a78b5d3083" +checksum = "39ec233600388692f5b0c86304e446c1c5928d5389a4c1e9a458b9b3c9d2b0f1" dependencies = [ "async-trait", "derive-deftly", @@ -3642,7 +3689,8 @@ dependencies = [ "educe", "either", "futures", - "itertools 0.12.0", + "itertools 0.13.0", + "oneshot-fused-workaround", "postage", "rand", "retry-error", @@ -3673,14 +3721,14 @@ dependencies = [ [[package]] name = "tor-hscrypto" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e919b4b8680fe6e5ddd95744c314c380011d33b68e3dbafc51451d12fd7758c6" +checksum = "3db824b336c082804882221188097f73bcd8f551da2f56144c7b560c971f44f9" dependencies = [ "data-encoding", "derive_more", "digest", - "itertools 0.12.0", + "itertools 0.13.0", "paste", "rand", "safelog", @@ -3696,9 +3744,9 @@ dependencies = [ [[package]] name = "tor-keymgr" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b14cc41aabd46ae923aaa5e96ad7d8ceb8c320da7a49cee05ee153acdf6f6c" +checksum = "96e3442c4b1b9373eca3e95e27cd7ac81f5c63e9a5d6a1d7f756f9af53200640" dependencies = [ "amplify", "arrayvec", @@ -3711,7 +3759,7 @@ dependencies = [ "glob-match", "humantime", "inventory", - "itertools 0.12.0", + "itertools 0.13.0", "rand", "serde", "ssh-key", @@ -3728,9 +3776,9 @@ dependencies = [ [[package]] name = "tor-linkspec" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0bf13a55acd0163b8f227efeac4d00700e0e1bcf8b043b17e2941a88ca6c64" +checksum = "79554ce76d519f909a5bba8beea6b2187c4ba131a717944258dce7fcec235a8f" dependencies = [ "base64ct", "by_address", @@ -3739,7 +3787,7 @@ dependencies = [ "derive_builder_fork_arti", "derive_more", "hex", - "itertools 0.12.0", + "itertools 0.13.0", "safelog", "serde", "serde_with", @@ -3754,9 +3802,9 @@ dependencies = [ [[package]] name = "tor-llcrypto" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a050d7145f3d1209d579f2d62d0da3eeb25e269d5a98ec1ef3c11c72d8eb174" +checksum = "0d2fe75fd5713ca4012a4047fcbd3d529c1db9f5ce7c9ab6f4630b503eab55a9" dependencies = [ "aes", "base64ct", @@ -3779,15 +3827,16 @@ dependencies = [ "simple_asn1", "subtle", "thiserror", + "visibility", "x25519-dalek", "zeroize", ] [[package]] name = "tor-log-ratelim" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339de85e1ffa31035cc24f02366f2ae0cdb5d93eefc9a5487042dea4f6a6ccf6" +checksum = "ee8a5d8547bcbdd92d40267b863ff3482846972b1cfdbec4841c668a6539b4c0" dependencies = [ "futures", "humantime", @@ -3801,9 +3850,9 @@ dependencies = [ [[package]] name = "tor-netdir" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228eeb225054455c0545a4d5e06d188790e5bd85129eefb9b24c86cb18f22ce2" +checksum = "f493e5c390efa9625d5f44d0f33743fede0ff47bc1e4fada640a44e13004c963" dependencies = [ "bitflags 2.4.0", "derive_more", @@ -3811,7 +3860,7 @@ dependencies = [ "futures", "hex", "humantime", - "itertools 0.12.0", + "itertools 0.13.0", "num_enum", "rand", "serde", @@ -3833,9 +3882,9 @@ dependencies = [ [[package]] name = "tor-netdoc" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b34733b319ff6aa7a146973647c00120d111aa77da221d28309bacf144e3239" +checksum = "0fdce7a98b0d30652ca59c1e7c3595b2bc064eb805be56bc9b67a306a60d6592" dependencies = [ "amplify", "base64ct", @@ -3847,7 +3896,7 @@ dependencies = [ "educe", "hex", "humantime", - "itertools 0.12.0", + "itertools 0.13.0", "once_cell", "phf", "rand", @@ -3870,37 +3919,42 @@ dependencies = [ "tor-llcrypto", "tor-protover", "tor-units", + "void", "weak-table", "zeroize", ] [[package]] name = "tor-persist" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be17e068b7d71554504245c3e6770c55c245435a42622d2b60b09c13539d93a5" +checksum = "38b7942bb43a51129ae4e84124e82e48f96e453a6fb8381c5c2b23899116d411" dependencies = [ "derive-deftly", "derive_more", "filetime", "fs-mistrust", "fslock", - "itertools 0.12.0", + "futures", + "itertools 0.13.0", + "oneshot-fused-workaround", "paste", "sanitize-filename", "serde", "serde_json", "thiserror", + "tor-async-utils", "tor-basic-utils", "tor-error", "tracing", + "void", ] [[package]] name = "tor-proto" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95024a4b55a2e7f239c171643814ea1b2d5a2eadd0b44dae7b34467982007df" +checksum = "2ec37cab7389f53751a02a01a0324aaf09a854b7a8ac56d0ebd44593fadde0b0" dependencies = [ "asynchronous-codec", "bitvec", @@ -3914,6 +3968,7 @@ dependencies = [ "futures", "hkdf", "hmac", + "oneshot-fused-workaround", "pin-project", "rand", "rand_core", @@ -3946,9 +4001,9 @@ dependencies = [ [[package]] name = "tor-protover" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31af5dd9523db6727fc24defef908f77a7b2698cd143af6987f6bd5cc47aed0b" +checksum = "88cf099c5c91216c7d0a6b2d4c67bb18f0786ad8c8273063d6a45c51b49b40c2" dependencies = [ "caret", "thiserror", @@ -3956,15 +4011,17 @@ dependencies = [ [[package]] name = "tor-ptmgr" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f753345a4b3b064fa6f6e10343c4326b4508bcb010a29090897e3367f25ac99" +checksum = "cbc00185a99bc57adc381a7248842270e1deeb5b04067c67c2f8ddea54248c2d" dependencies = [ "async-trait", + "cfg-if", "derive_builder_fork_arti", "fs-mistrust", "futures", - "itertools 0.12.0", + "itertools 0.13.0", + "oneshot-fused-workaround", "serde", "thiserror", "tor-async-utils", @@ -3980,9 +4037,9 @@ dependencies = [ [[package]] name = "tor-relay-selection" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd23d7db7d25c7682c81147c8acf6a6bc9824029ebe575b5610784201aa6326" +checksum = "8c8aa5505d8e938ac9e75b819d803396fe69fb483c991b4495fe4b28d374a89c" dependencies = [ "rand", "serde", @@ -3994,9 +4051,9 @@ dependencies = [ [[package]] name = "tor-rtcompat" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6655852504f1defe01a1c1cd5b681ce5d81af5cfb8c18adb26b9d2155fdd1d7c" +checksum = "eff8a108d6a5e8ae0a97cd1fa41c00360d86bce5e5d7bd0ee1566bcb25b44e44" dependencies = [ "async-native-tls", "async-trait", @@ -4011,30 +4068,30 @@ dependencies = [ "thiserror", "tokio", "tokio-util", + "tor-error", "tracing", ] [[package]] name = "tor-rtmock" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f69e39720387c6a66a07eb95a04bbbe63993bfe9be94fb8f5a39f39e190160" +checksum = "71824b2341740bc2338e554cd4832b692afa44e0eb11519b19ebbcd0179f0799" dependencies = [ "amplify", "async-trait", - "backtrace", "derive-deftly", "derive_more", "educe", "futures", "humantime", - "itertools 0.12.0", + "itertools 0.13.0", + "oneshot-fused-workaround", "pin-project", "priority-queue", "slotmap", "strum 0.26.3", "thiserror", - "tor-async-utils", "tor-error", "tor-rtcompat", "tracing", @@ -4044,9 +4101,9 @@ dependencies = [ [[package]] name = "tor-socksproto" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b05f853360120f8d075ab59b7400c0df15f3533bf26554669c8f09ba71dc7b1" +checksum = "e2ea008c29b34604d49f25540e4d72b3bdce0d1021aa82f85e790262280804f0" dependencies = [ "caret", "subtle", @@ -4057,9 +4114,9 @@ dependencies = [ [[package]] name = "tor-units" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae68a36e67c399141035fba00dea9c0a34cdc094a260faf2b03565cbcf9e7ca" +checksum = "c549e18390341623fb8ee988b2622d9b8fa11727d66717c9331156f84e54b09d" dependencies = [ "derive_more", "thiserror", @@ -4096,7 +4153,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -4246,7 +4303,7 @@ checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -4292,7 +4349,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -4314,7 +4371,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4559,7 +4616,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] @@ -4579,7 +4636,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.77", ] [[package]] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 030435f3..037a375d 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,11 +1,10 @@ -# SPDX-FileCopyrightText: 2022 Foundation Devices Inc. # SPDX-FileCopyrightText: 2024 Foundation Devices Inc. # # SPDX-License-Identifier: MIT [package] name = "tor" -version = "0.0.6" +version = "0.0.8" authors = ["Igor Cota "] edition = "2021" @@ -15,10 +14,10 @@ crate-type = ["cdylib", "staticlib"] [dependencies] lazy_static = "1.4" tokio = { version = "1", features = ["full"] } -arti-client = { version = "0.19.0", features = ["static"] } -arti = { version = "1.2.4", features = ["experimental-api", "static"] } -tor-rtcompat = { version = "0.19.0", features = ["static"] } -tor-config = "0.19.0" +arti-client = { version = "0.22.0", features = ["static"] } +arti = { version = "1.2.7", features = ["experimental-api", "static"] } +tor-rtcompat = { version = "0.22.0", features = ["static"] } +tor-config = "0.22.0" log = "0.4.20" #android_log-sys = "0.3.1" rlimit = "0.10.1" diff --git a/rust/target/tor.h b/rust/target/tor.h index 9030a496..052f1375 100644 --- a/rust/target/tor.h +++ b/rust/target/tor.h @@ -1,13 +1,3 @@ -/* - * SPDX-FileCopyrightText: 2024 Foundation Devices Inc. - * - * SPDX-License-Identifier: MIT - */ - -// SPDX-FileCopyrightText: 2024 Foundation Devices Inc. -// -// SPDX-License-Identifier: MIT - #include #include #include