diff options
Diffstat (limited to 'crates')
25 files changed, 40 insertions, 31 deletions
diff --git a/crates/arti-client/Cargo.toml b/crates/arti-client/Cargo.toml index b0d58b93e..42ce27ca9 100644 --- a/crates/arti-client/Cargo.toml +++ b/crates/arti-client/Cargo.toml @@ -100,7 +100,8 @@ accel-sha1-asm = ["tor-llcrypto/with-sha1-asm", "__is_nonadditive"] accel-openssl = ["tor-llcrypto/with-openssl", "__is_nonadditive"] onion-service-client = ["tor-hsclient", "tor-hscrypto"] -onion-service-cli-extra = ["tor-keymgr/onion-service-cli-extra"] + +onion-service-cli-extra = ["tor-keymgr/onion-service-cli-extra", "__is_experimental"] onion-service-service = ["tor-hsservice", "tor-hscrypto", "tor-persist/state-dir", "keymgr"] keymgr = ["tor-keymgr/keymgr", "tor-hsclient/keymgr"] vanguards = ["tor-guardmgr/vanguards", "tor-circmgr/vanguards"] @@ -129,6 +130,7 @@ experimental = [ "tor-hsservice/experimental", "tor-keymgr/experimental", "restricted-discovery", + "onion-service-cli-extra", ] # Enable experimental APIs that are not yet officially supported. @@ -153,7 +155,7 @@ __is_experimental = [] anyhow = { version = "1.0.23", optional = true } async-trait = "0.1.54" cfg-if = "1.0.0" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } dyn-clone = { version = "1.0.11", optional = true } @@ -184,7 +186,6 @@ tor-guardmgr = { path = "../tor-guardmgr", version = "0.31.0" } tor-hsclient = { path = "../tor-hsclient", version = "0.31.0", optional = true } tor-hscrypto = { path = "../tor-hscrypto", version = "0.31.0", optional = true } tor-hsservice = { path = "../tor-hsservice", version = "0.31.0", optional = true } -tor-key-forge = { path = "../tor-key-forge", version = "0.31.0" } tor-keymgr = { path = "../tor-keymgr", version = "0.31.0", default-features = false } tor-linkspec = { path = "../tor-linkspec", version = "0.31.0" } tor-llcrypto = { path = "../tor-llcrypto", version = "0.31.0" } diff --git a/crates/arti-rpcserver/Cargo.toml b/crates/arti-rpcserver/Cargo.toml index b6d15d044..def32411d 100644 --- a/crates/arti-rpcserver/Cargo.toml +++ b/crates/arti-rpcserver/Cargo.toml @@ -39,7 +39,7 @@ async-trait = "0.1.54" asynchronous-codec = { version = "0.7.0", features = ["json"] } base64ct = "1.5.1" bytes = "1" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } erased-serde = "0.4.2" futures = "0.3.14" diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml index 0fe3d6d17..08fe7f80d 100644 --- a/crates/arti/Cargo.toml +++ b/crates/arti/Cargo.toml @@ -59,7 +59,7 @@ full = [ "tor-rpc-connect?/full", "signal-hook", "signal-hook-async-std", - "dialoguer", + "dialoguer", "tor-key-forge/full", "tor-keymgr/full", ] async-std = [ @@ -78,6 +78,7 @@ memquota = ["arti-client/memquota"] tokio = ["tokio-crate", "arti-client/tokio", "tor-rtcompat/tokio", "tokio-util"] native-tls = ["arti-client/native-tls", "tor-rtcompat/native-tls"] onion-service-client = ["arti-client/onion-service-client"] + onion-service-cli-extra = ["arti-client/onion-service-cli-extra", "__is_experimental"] onion-service-service = ["arti-client/onion-service-service", "tor-hsrproxy", "tor-hsservice"] vanguards = ["arti-client/vanguards"] @@ -121,7 +122,7 @@ experimental = [ "restricted-discovery", "hsc", "tor-hsservice/experimental", - "ctor-keystore", + "ctor-keystore", "onion-service-cli-extra", ] metrics = [ "dep:metrics-exporter-prometheus", @@ -150,7 +151,7 @@ async-ctrlc = { version = "1.2.0", optional = true } async-signal = { version = "0.2.10", optional = true } cfg-if = "1.0.0" clap = { version = "4.3.24", features = ["string", "wrap_help", "derive"] } -derive-deftly = { version = "~1.0.0", features = ["full", "beta"], optional = true } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"], optional = true } derive_builder = { version = "0.11", package = "derive_builder_fork_arti" } fs-mistrust = { path = "../fs-mistrust", version = "0.9.3" } futures = "0.3.14" diff --git a/crates/tor-async-utils/Cargo.toml b/crates/tor-async-utils/Cargo.toml index 4aac2667d..161be4993 100644 --- a/crates/tor-async-utils/Cargo.toml +++ b/crates/tor-async-utils/Cargo.toml @@ -13,7 +13,7 @@ categories = ["rust-patterns"] repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } educe = "0.4.22" futures = "0.3.14" oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.2.0" } diff --git a/crates/tor-bytes/Cargo.toml b/crates/tor-bytes/Cargo.toml index 93bafdb3a..225e4e620 100644 --- a/crates/tor-bytes/Cargo.toml +++ b/crates/tor-bytes/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] bytes = "1" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } digest = { version = "0.10.0", features = ["subtle", "mac"] } educe = "0.4.22" safelog = { path = "../safelog", version = "0.4.5" } diff --git a/crates/tor-cell/Cargo.toml b/crates/tor-cell/Cargo.toml index 04be151ac..967b6a508 100644 --- a/crates/tor-cell/Cargo.toml +++ b/crates/tor-cell/Cargo.toml @@ -57,7 +57,7 @@ amplify = { version = "4", default-features = false, features = ["derive"] } bitflags = "2" bytes = "1" caret = { path = "../caret", version = "0.5.0" } -derive-deftly = "1.0.0" +derive-deftly = "1.1.0" derive_more = { version = "2.0.1", features = ["full"] } educe = "0.4.22" paste = "1" diff --git a/crates/tor-config/Cargo.toml b/crates/tor-config/Cargo.toml index 7f3d6fcc9..0649a2a28 100644 --- a/crates/tor-config/Cargo.toml +++ b/crates/tor-config/Cargo.toml @@ -37,7 +37,7 @@ __is_experimental = [] [dependencies] amplify = { version = "4", default-features = false, features = ["derive"] } cfg-if = "1.0.0" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } educe = "0.4.22" either = "1" diff --git a/crates/tor-guardmgr/Cargo.toml b/crates/tor-guardmgr/Cargo.toml index 71cfb32cd..4409925ce 100644 --- a/crates/tor-guardmgr/Cargo.toml +++ b/crates/tor-guardmgr/Cargo.toml @@ -60,7 +60,7 @@ __is_experimental = [] [dependencies] amplify = { version = "4", default-features = false, features = ["derive"] } base64ct = "1.5.1" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } dyn-clone = "1.0.4" diff --git a/crates/tor-hsclient/Cargo.toml b/crates/tor-hsclient/Cargo.toml index 1dbad2127..4b3e4c17b 100644 --- a/crates/tor-hsclient/Cargo.toml +++ b/crates/tor-hsclient/Cargo.toml @@ -55,7 +55,7 @@ experimental = ["keymgr", "hs-pow-full"] [dependencies] async-trait = "0.1.54" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } educe = "0.4.22" either = "1" diff --git a/crates/tor-hscrypto/Cargo.toml b/crates/tor-hscrypto/Cargo.toml index 23d2eacf9..dc647cc08 100644 --- a/crates/tor-hscrypto/Cargo.toml +++ b/crates/tor-hscrypto/Cargo.toml @@ -46,7 +46,7 @@ arrayvec = { version = "0.7.4", optional = true } blake2 = { version = "0.10.6", optional = true } cipher = { version = "0.4.1", features = ["zeroize"], optional = true } data-encoding = "2.3.1" # want MSVC i686 build fix, data-encoding/issues/33 -derive-deftly = { version = "1.0.0", optional = true } +derive-deftly = { version = "1.1.0", optional = true } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" equix = { path = "../equix", version = "0.2.4", optional = true } diff --git a/crates/tor-hsrproxy/Cargo.toml b/crates/tor-hsrproxy/Cargo.toml index cddf37fde..28a8f4a2e 100644 --- a/crates/tor-hsrproxy/Cargo.toml +++ b/crates/tor-hsrproxy/Cargo.toml @@ -43,7 +43,7 @@ __is_experimental = [] restricted-discovery = ["tor-hsservice/restricted-discovery", "__is_experimental"] [dependencies] -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } futures = "0.3.14" # postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] } diff --git a/crates/tor-hsservice/Cargo.toml b/crates/tor-hsservice/Cargo.toml index 6175fb8d2..238fe3703 100644 --- a/crates/tor-hsservice/Cargo.toml +++ b/crates/tor-hsservice/Cargo.toml @@ -74,7 +74,7 @@ arrayvec = { version = "0.7.4", features = ["serde"], optional = true } async-trait = "0.1.54" base64ct = "1.5.1" cfg-if = "1.0.0" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" diff --git a/crates/tor-key-forge/Cargo.toml b/crates/tor-key-forge/Cargo.toml index 8cac27dca..26e5c8a6f 100644 --- a/crates/tor-key-forge/Cargo.toml +++ b/crates/tor-key-forge/Cargo.toml @@ -25,7 +25,7 @@ __is_nonadditive = [] __is_experimental = [] [dependencies] -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } downcast-rs = "2.0.1" paste = "1" diff --git a/crates/tor-keymgr/Cargo.toml b/crates/tor-keymgr/Cargo.toml index 3f0e6522d..3b7611252 100644 --- a/crates/tor-keymgr/Cargo.toml +++ b/crates/tor-keymgr/Cargo.toml @@ -33,11 +33,18 @@ full = [ # # These APIs are not covered by semantic versioning. Using this # feature voids your "semver warrantee". -experimental = ["ephemeral-keystore", "ctor-keystore", "testing", "experimental-api"] +experimental = [ + "ephemeral-keystore", + "ctor-keystore", + "testing", + "experimental-api", + "onion-service-cli-extra", +] experimental-api = ["__is_experimental"] ephemeral-keystore = ["__is_experimental"] ctor-keystore = ["data-encoding", "__is_experimental"] + onion-service-cli-extra = ["keymgr", "__is_experimental"] testing = ["__is_experimental"] __is_experimental = [] @@ -47,7 +54,7 @@ amplify = { version = "4", default-features = false, features = ["derive"] } arrayvec = "0.7.3" cfg-if = "1.0.0" data-encoding = { version = "2.3.1", optional = true } -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } downcast-rs = "2.0.1" diff --git a/crates/tor-linkspec/Cargo.toml b/crates/tor-linkspec/Cargo.toml index b5d16c7de..976d7844f 100644 --- a/crates/tor-linkspec/Cargo.toml +++ b/crates/tor-linkspec/Cargo.toml @@ -34,7 +34,7 @@ __is_experimental = [] base64ct = "1.5.1" by_address = "1" caret = { path = "../caret", version = "0.5.0" } -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } hex = "0.4" diff --git a/crates/tor-llcrypto/Cargo.toml b/crates/tor-llcrypto/Cargo.toml index 1abf3d6dd..bb85092e2 100644 --- a/crates/tor-llcrypto/Cargo.toml +++ b/crates/tor-llcrypto/Cargo.toml @@ -47,7 +47,7 @@ cipher = { version = "0.4.3", optional = true, features = ["zeroize"] } ctr = { version = "0.9", features = ["zeroize"] } curve25519-dalek = "4.1" der-parser = { version = "10", features = ["serialize"] } -derive-deftly = { version = "1.0.0", optional = true } +derive-deftly = { version = "1.1.0", optional = true } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" ed25519-dalek = { version = "2.1", features = ["batch", "hazmat"] } diff --git a/crates/tor-memquota/Cargo.toml b/crates/tor-memquota/Cargo.toml index 922cb12d2..7e662e197 100644 --- a/crates/tor-memquota/Cargo.toml +++ b/crates/tor-memquota/Cargo.toml @@ -12,7 +12,7 @@ categories = ["memory-management"] repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } dyn-clone = "1.0.17" educe = "0.4.22" diff --git a/crates/tor-netdoc/Cargo.toml b/crates/tor-netdoc/Cargo.toml index 9fe1fa115..2571783c2 100644 --- a/crates/tor-netdoc/Cargo.toml +++ b/crates/tor-netdoc/Cargo.toml @@ -101,7 +101,7 @@ hex-literal = { version = "0.4", optional = true } humantime = "2" itertools = "0.14.0" memchr = "2.5" -phf = { version = "0.11.1", features = ["macros"] } +phf = { version = "0.12.1", features = ["macros"] } rand = { version = "0.9.1", optional = true } serde = { version = "1.0.103", features = ["derive"] } serde_with = "3.0.0" diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml index dc6c6f228..5aa8d3d8a 100644 --- a/crates/tor-persist/Cargo.toml +++ b/crates/tor-persist/Cargo.toml @@ -32,7 +32,7 @@ __is_experimental = [] [dependencies] amplify = { version = "4", default-features = false, features = ["derive"], optional = true } -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } filetime = { version = "0.2", default-features = false } fs-mistrust = { path = "../fs-mistrust", version = "0.9.3", features = ["walkdir"] } @@ -54,7 +54,7 @@ void = "1" [dev-dependencies] anyhow = { version = "1.0.23" } -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } humantime = "2" itertools = "0.14.0" tempfile = "3" diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml index 1f4eb7dbf..8a6791c0e 100644 --- a/crates/tor-proto/Cargo.toml +++ b/crates/tor-proto/Cargo.toml @@ -83,7 +83,7 @@ cfg-if = "1.0.0" cipher = { version = "0.4.1", features = ["zeroize"] } coarsetime = "0.1.20" ctr = { version = "0.9", optional = true, features = ["zeroize"] } -derive-deftly = "1.0.0" +derive-deftly = "1.1.0" derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } derive_more = { version = "2.0.1", features = ["full"] } digest = "0.10.0" diff --git a/crates/tor-relay-crypto/Cargo.toml b/crates/tor-relay-crypto/Cargo.toml index aec5003cf..d9ceb7410 100644 --- a/crates/tor-relay-crypto/Cargo.toml +++ b/crates/tor-relay-crypto/Cargo.toml @@ -24,7 +24,7 @@ full = [ ] [dependencies] -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } humantime = "2" tor-cert = { path = "../tor-cert", version = "0.31.0", features = ["encode"] } diff --git a/crates/tor-rpcbase/Cargo.toml b/crates/tor-rpcbase/Cargo.toml index b1abe8c81..96b492db9 100644 --- a/crates/tor-rpcbase/Cargo.toml +++ b/crates/tor-rpcbase/Cargo.toml @@ -12,7 +12,7 @@ categories = ["asynchronous"] repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [dependencies] -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } downcast-rs = "2.0.1" erased-serde = "0.4.2" diff --git a/crates/tor-rtmock/Cargo.toml b/crates/tor-rtmock/Cargo.toml index 47b02b2cd..cfd5c6238 100644 --- a/crates/tor-rtmock/Cargo.toml +++ b/crates/tor-rtmock/Cargo.toml @@ -15,7 +15,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" amplify = { version = "4", default-features = false, features = ["derive"] } assert_matches = "1.5.0" async-trait = "0.1.54" -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } derive_more = { version = "2.0.1", features = ["full"] } educe = "0.4.22" futures = "0.3.14" diff --git a/crates/tor-socksproto/Cargo.toml b/crates/tor-socksproto/Cargo.toml index 061b35691..3b053353e 100644 --- a/crates/tor-socksproto/Cargo.toml +++ b/crates/tor-socksproto/Cargo.toml @@ -30,7 +30,7 @@ full = [ amplify = { version = "4", default-features = false, features = ["derive"] } arbitrary = { version = "1.0.1", optional = true, features = ["derive"] } caret = { path = "../caret", version = "0.5.0" } -derive-deftly = { version = "~1.0.0", features = ["full", "beta"] } +derive-deftly = { version = "~1.1.0", features = ["full", "beta"] } educe = "0.4.22" safelog = { path = "../safelog", version = "0.4.5" } subtle = "2" diff --git a/crates/tor-units/Cargo.toml b/crates/tor-units/Cargo.toml index ad0d232a3..21795f924 100644 --- a/crates/tor-units/Cargo.toml +++ b/crates/tor-units/Cargo.toml @@ -13,7 +13,7 @@ categories = ["rust-patterns"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -derive-deftly = { version = "1.0.0", optional = true } +derive-deftly = { version = "1.1.0", optional = true } derive_more = { version = "2.0.1", features = ["full"] } serde = { version = "1.0.103", features = ["derive"] } thiserror = "2" |