From e1f8ce9a97aec783164c1d3fd33d570627bc4101 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 11 Aug 2024 16:54:06 -0400 Subject: [PATCH] cleanup workspace duplicated dependencies --- Cargo.lock | 2 - Cargo.toml | 51 +++++++++++++++++++ crates/daemon/keyforkd-client/Cargo.toml | 18 +++---- crates/daemon/keyforkd-models/Cargo.toml | 6 +-- crates/daemon/keyforkd/Cargo.toml | 24 ++++----- crates/derive/keyfork-derive-key/Cargo.toml | 8 +-- .../derive/keyfork-derive-openpgp/Cargo.toml | 14 ++--- .../keyfork-derive-path-data/Cargo.toml | 2 +- crates/derive/keyfork-derive-util/Cargo.toml | 20 ++++---- crates/keyfork-shard/Cargo.toml | 26 +++++----- crates/keyfork/Cargo.toml | 38 +++++++------- crates/qrcode/keyfork-qrcode/Cargo.toml | 10 ++-- crates/qrcode/keyfork-zbar/Cargo.toml | 8 +-- crates/util/keyfork-bin/Cargo.toml | 2 +- crates/util/keyfork-crossterm/Cargo.toml | 4 +- crates/util/keyfork-entropy/Cargo.toml | 4 +- crates/util/keyfork-frame/Cargo.toml | 6 +-- crates/util/keyfork-mnemonic/Cargo.toml | 10 ++-- crates/util/keyfork-prompt/Cargo.toml | 8 +-- .../util/keyfork-slip10-test-data/Cargo.toml | 2 +- deny.toml | 2 + 21 files changed, 158 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d88b51..7b0559b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1792,8 +1792,6 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2", - "signature", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index aa66631..1ea3b6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,57 @@ members = [ "crates/util/smex", ] +[workspace.dependencies] + +# Keyfork dependencies +keyforkd = { version = "0.1.1", path = "crates/daemon/keyforkd", registry = "distrust", default-features = false } +keyforkd-client = { version = "0.2.0", path = "crates/daemon/keyforkd-client", registry = "distrust", default-features = false } +keyforkd-models = { version = "0.2.0", path = "crates/daemon/keyforkd-models", registry = "distrust", default-features = false } +keyfork-derive-key = { version = "0.1.1", path = "crates/derive/keyfork-derive-key", registry = "distrust", default-features = false } +keyfork-derive-openpgp = { version = "0.1.2", path = "crates/derive/keyfork-derive-openpgp", registry = "distrust", default-features = false } +keyfork-derive-path-data = { version = "0.1.1", path = "crates/derive/keyfork-derive-path-data", registry = "distrust", default-features = false } +keyfork-derive-util = { version = "0.2.0", path = "crates/derive/keyfork-derive-util", registry = "distrust", default-features = false } +keyfork-shard = { version = "0.2.2", path = "crates/keyfork-shard", registry = "distrust", default-features = false } +keyfork-qrcode = { version = "0.1.1", path = "crates/qrcode/keyfork-qrcode", registry = "distrust", default-features = false } +keyfork-zbar = { version = "0.1.0", path = "crates/qrcode/keyfork-zbar", registry = "distrust", default-features = false } +keyfork-zbar-sys = { version = "0.1.0", path = "crates/qrcode/keyfork-zbar-sys", registry = "distrust", default-features = false } +keyfork-bin = { version = "0.1.0", path = "crates/util/keyfork-bin", registry = "distrust", default-features = false } +keyfork-bug = { version = "0.1.0", path = "crates/util/keyfork-bug", registry = "distrust", default-features = false } +keyfork-crossterm = { version = "0.27.1", path = "crates/util/keyfork-crossterm", registry = "distrust", default-features = false } +keyfork-entropy = { version = "0.1.1", path = "crates/util/keyfork-entropy", registry = "distrust", default-features = false } +keyfork-frame = { version = "0.1.0", path = "crates/util/keyfork-frame", registry = "distrust", default-features = false } +keyfork-mnemonic = { version = "0.3.0", path = "crates/util/keyfork-mnemonic", registry = "distrust", default-features = false } +keyfork-prompt = { version = "0.1.1", path = "crates/util/keyfork-prompt", registry = "distrust", default-features = false } +keyfork-slip10-test-data = { version = "0.1.0", path = "crates/util/keyfork-slip10-test-data", registry = "distrust", default-features = false } +smex = { version = "0.1.0", path = "crates/util/smex", registry = "distrust", default-features = false } + +# External dependencies + +# Cryptography +ed25519-dalek = "2.1.1" +hmac = "0.12.1" +k256 = { version = "0.13.3", default-features = false, features = ["std"] } +sha2 = "0.10.8" + +# OpenPGP +card-backend-pcsc = "0.5.0" +openpgp-card = { version = "0.4.1" } +openpgp-card-sequoia = { version = "0.2.0", default-features = false } +sequoia-openpgp = { version = "1.21.2", default-features = false, features = ["compression"] } + +# Serialization +bincode = "1.3.3" +serde = { version= "1.0.195", features = ["derive"] } +serde_json = "1.0.111" + +# Misc. +anyhow = "1.0.79" +hex-literal = "0.4.1" +image = { version = "0.24.8", default-features = false } +thiserror = "1.0.56" +tokio = "1.35.1" +v4l = "0.14.0" + [profile.dev.package.keyfork-qrcode] opt-level = 3 debug = true diff --git a/crates/daemon/keyforkd-client/Cargo.toml b/crates/daemon/keyforkd-client/Cargo.toml index a60ec7b..d8781fb 100644 --- a/crates/daemon/keyforkd-client/Cargo.toml +++ b/crates/daemon/keyforkd-client/Cargo.toml @@ -12,14 +12,14 @@ ed25519 = ["keyfork-derive-util/ed25519", "ed25519-dalek"] secp256k1 = ["keyfork-derive-util/secp256k1", "k256"] [dependencies] -keyfork-derive-util = { version = "0.2.0", path = "../../derive/keyfork-derive-util", default-features = false, registry = "distrust" } -keyfork-frame = { version = "0.1.0", path = "../../util/keyfork-frame", registry = "distrust" } -keyforkd-models = { version = "0.2.0", path = "../keyforkd-models", registry = "distrust" } -bincode = "1.3.3" -thiserror = "1.0.49" -k256 = { version = "0.13.3", optional = true } -ed25519-dalek = { version = "2.1.1", optional = true } +keyfork-derive-util = { workspace = true, default-features = false } +keyfork-frame = { workspace = true } +keyforkd-models = { workspace = true } +bincode = { workspace = true } +thiserror = { workspace = true } +k256 = { workspace = true, default-features = false, features = ["std"], optional = true } +ed25519-dalek = { workspace = true, optional = true } [dev-dependencies] -keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data", registry = "distrust" } -keyforkd = { path = "../keyforkd", registry = "distrust" } +keyfork-slip10-test-data = { workspace = true } +keyforkd = { workspace = true } diff --git a/crates/daemon/keyforkd-models/Cargo.toml b/crates/daemon/keyforkd-models/Cargo.toml index 6930261..861613c 100644 --- a/crates/daemon/keyforkd-models/Cargo.toml +++ b/crates/daemon/keyforkd-models/Cargo.toml @@ -7,6 +7,6 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -keyfork-derive-util = { version = "0.2.0", path = "../../derive/keyfork-derive-util", default-features = false, registry = "distrust" } -serde = { version = "1.0.190", features = ["derive"] } -thiserror = "1.0.50" +keyfork-derive-util = { workspace = true, default-features = false } +serde = { workspace = true } +thiserror = { workspace = true } diff --git a/crates/daemon/keyforkd/Cargo.toml b/crates/daemon/keyforkd/Cargo.toml index 519bdab..76e4b44 100644 --- a/crates/daemon/keyforkd/Cargo.toml +++ b/crates/daemon/keyforkd/Cargo.toml @@ -12,28 +12,28 @@ tracing = ["tower/tracing", "tokio/tracing", "dep:tracing", "dep:tracing-subscri multithread = ["tokio/rt-multi-thread"] [dependencies] -keyfork-bug = { version = "0.1.0", path = "../../util/keyfork-bug", registry = "distrust" } -keyfork-derive-util = { version = "0.2.0", path = "../../derive/keyfork-derive-util", registry = "distrust" } -keyfork-frame = { version = "0.1.0", path = "../../util/keyfork-frame", features = ["async"], registry = "distrust" } -keyfork-mnemonic = { version = "0.3.0", path = "../../util/keyfork-mnemonic", registry = "distrust" } -keyfork-derive-path-data = { version = "0.1.0", path = "../../derive/keyfork-derive-path-data", registry = "distrust" } -keyforkd-models = { version = "0.2.0", path = "../keyforkd-models", registry = "distrust" } +keyfork-bug = { workspace = true } +keyfork-derive-util = { workspace = true } +keyfork-frame = { workspace = true, features = ["async"] } +keyfork-mnemonic = { workspace = true } +keyfork-derive-path-data = { workspace = true } +keyforkd-models = { workspace = true } # Not personally audited -bincode = "1.3.3" +bincode = { workspace = true } # Ecosystem trust, not personally audited -tokio = { version = "1.32.0", features = ["io-util", "macros", "rt", "io-std", "net", "fs", "signal"] } +tokio = { workspace = true, features = ["io-util", "macros", "rt", "io-std", "net", "fs", "signal"] } tracing = { version = "0.1.37", optional = true } tracing-error = { version = "0.2.0", optional = true } tracing-subscriber = { version = "0.3.17", optional = true, features = ["env-filter"] } tower = { version = "0.4.13", features = ["tokio", "util"] } # Personally audited -thiserror = "1.0.47" -serde = { version = "1.0.186", features = ["derive"] } +thiserror = { workspace = true } +serde = { workspace = true } tempfile = { version = "3.10.0", default-features = false } [dev-dependencies] -hex-literal = "0.4.1" -keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data", registry = "distrust" } +hex-literal = { workspace = true } +keyfork-slip10-test-data = { workspace = true } diff --git a/crates/derive/keyfork-derive-key/Cargo.toml b/crates/derive/keyfork-derive-key/Cargo.toml index f66a11a..303eda1 100644 --- a/crates/derive/keyfork-derive-key/Cargo.toml +++ b/crates/derive/keyfork-derive-key/Cargo.toml @@ -7,7 +7,7 @@ license = "AGPL-3.0-only" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -keyfork-derive-util = { version = "0.2.0", path = "../keyfork-derive-util", registry = "distrust" } -keyforkd-client = { version = "0.2.0", path = "../../daemon/keyforkd-client", registry = "distrust" } -smex = { version = "0.1.0", path = "../../util/smex", registry = "distrust" } -thiserror = "1.0.48" +keyfork-derive-util = { workspace = true } +keyforkd-client = { workspace = true } +smex = { workspace = true } +thiserror = { workspace = true } diff --git a/crates/derive/keyfork-derive-openpgp/Cargo.toml b/crates/derive/keyfork-derive-openpgp/Cargo.toml index f679ed9..17d891b 100644 --- a/crates/derive/keyfork-derive-openpgp/Cargo.toml +++ b/crates/derive/keyfork-derive-openpgp/Cargo.toml @@ -10,10 +10,10 @@ default = ["bin"] bin = ["sequoia-openpgp/crypto-nettle"] [dependencies] -keyfork-derive-util = { version = "0.2.0", path = "../keyfork-derive-util", default-features = false, features = ["ed25519"], registry = "distrust" } -keyforkd-client = { version = "0.2.0", path = "../../daemon/keyforkd-client", default-features = false, features = ["ed25519"], registry = "distrust" } -ed25519-dalek = "2.0.0" -sequoia-openpgp = { version = "1.17.0", default-features = false } -anyhow = "1.0.75" -thiserror = "1.0.49" -keyfork-derive-path-data = { version = "0.1.1", path = "../keyfork-derive-path-data" } +keyfork-derive-util = { workspace = true, default-features = false, features = ["ed25519"] } +keyforkd-client = { workspace = true, default-features = false, features = ["ed25519"] } +ed25519-dalek = { workspace = true } +sequoia-openpgp = { workspace = true } +anyhow = { workspace = true } +thiserror = { workspace = true } +keyfork-derive-path-data = { workspace = true } diff --git a/crates/derive/keyfork-derive-path-data/Cargo.toml b/crates/derive/keyfork-derive-path-data/Cargo.toml index 520b58b..d8c47b2 100644 --- a/crates/derive/keyfork-derive-path-data/Cargo.toml +++ b/crates/derive/keyfork-derive-path-data/Cargo.toml @@ -7,5 +7,5 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -keyfork-derive-util = { version = "0.2.0", path = "../keyfork-derive-util", default-features = false, registry = "distrust" } +keyfork-derive-util = { workspace = true, default-features = false } once_cell = "1.19.0" diff --git a/crates/derive/keyfork-derive-util/Cargo.toml b/crates/derive/keyfork-derive-util/Cargo.toml index a6a89a4..e88cb3b 100644 --- a/crates/derive/keyfork-derive-util/Cargo.toml +++ b/crates/derive/keyfork-derive-util/Cargo.toml @@ -12,25 +12,25 @@ secp256k1 = ["k256"] ed25519 = ["ed25519-dalek"] [dependencies] -keyfork-mnemonic = { version = "0.3.0", path = "../../util/keyfork-mnemonic", registry = "distrust" } -keyfork-bug = { version = "0.1.0", path = "../../util/keyfork-bug", registry = "distrust" } +keyfork-mnemonic = { workspace = true } +keyfork-bug = { workspace = true } # Included in Rust digest = "0.10.7" -sha2 = "0.10.7" +sha2 = { workspace = true } # Rust-Crypto ecosystem, not personally audited ripemd = "0.1.3" -hmac = { version = "0.12.1", features = ["std"] } +hmac = { workspace = true, features = ["std"] } # Personally audited -serde = { version = "1.0.186", features = ["derive"] } -thiserror = "1.0.47" +serde = { workspace = true } +thiserror = { workspace = true } # Optional, not personally audited -k256 = { version = "0.13.1", default-features = false, features = ["std", "arithmetic"], optional = true } -ed25519-dalek = { version = "2.0.0", optional = true } +k256 = { workspace = true, default-features = false, features = ["std", "arithmetic"], optional = true } +ed25519-dalek = { workspace = true, optional = true } [dev-dependencies] -hex-literal = "0.4.1" -keyfork-slip10-test-data = { version = "0.1.0", path = "../../util/keyfork-slip10-test-data", registry = "distrust" } +hex-literal = { workspace = true } +keyfork-slip10-test-data = { workspace = true } diff --git a/crates/keyfork-shard/Cargo.toml b/crates/keyfork-shard/Cargo.toml index 3d8050b..f9efec7 100644 --- a/crates/keyfork-shard/Cargo.toml +++ b/crates/keyfork-shard/Cargo.toml @@ -14,27 +14,27 @@ openpgp-card = ["openpgp-card-sequoia", "card-backend-pcsc", "card-backend", "de qrcode = ["keyfork-qrcode"] [dependencies] -keyfork-bug = { version = "0.1.0", path = "../util/keyfork-bug", registry = "distrust" } -keyfork-prompt = { version = "0.1.1", path = "../util/keyfork-prompt", default-features = false, features = ["mnemonic"], registry = "distrust" } -keyfork-qrcode = { version = "0.1.1", path = "../qrcode/keyfork-qrcode", optional = true, default-features = false, registry = "distrust" } -smex = { version = "0.1.0", path = "../util/smex", registry = "distrust" } +keyfork-bug = { workspace = true } +keyfork-prompt = { workspace = true, default-features = false, features = ["mnemonic"] } +keyfork-qrcode = { workspace = true, optional = true, default-features = false } +smex = { workspace = true } sharks = "0.5.0" -thiserror = "1.0.50" +thiserror = { workspace = true } # Remote operator mode -keyfork-mnemonic = { version = "0.3.0", path = "../util/keyfork-mnemonic", registry = "distrust" } +keyfork-mnemonic = { workspace = true } x25519-dalek = { version = "2.0.0", features = ["getrandom"] } aes-gcm = { version = "0.10.3", features = ["std"] } hkdf = { version = "0.12.4", features = ["std"] } -sha2 = "0.10.8" +sha2 = { workspace = true } # OpenPGP -keyfork-derive-openpgp = { version = "0.1.0", path = "../derive/keyfork-derive-openpgp", default-features = false, registry = "distrust" } -anyhow = { version = "1.0.79", optional = true } +keyfork-derive-openpgp = { workspace = true, default-features = false } +anyhow = { workspace = true, optional = true } card-backend = { version = "0.2.0", optional = true } -card-backend-pcsc = { version = "0.5.0", optional = true } -openpgp-card-sequoia = { version = "0.2.0", optional = true, default-features = false } -openpgp-card = { version = "0.4.0", optional = true } -sequoia-openpgp = { version = "1.17.0", optional = true, default-features = false } +card-backend-pcsc = { workspace = true, optional = true } +openpgp-card-sequoia = { workspace = true, optional = true } +openpgp-card = { workspace = true, optional = true } +sequoia-openpgp = { workspace = true, optional = true } base64 = "0.22.0" diff --git a/crates/keyfork/Cargo.toml b/crates/keyfork/Cargo.toml index 96e937d..53cd193 100644 --- a/crates/keyfork/Cargo.toml +++ b/crates/keyfork/Cargo.toml @@ -23,25 +23,25 @@ sequoia-crypto-backend-openssl = ["sequoia-openpgp/crypto-openssl"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -keyfork-bin = { version = "0.1.0", path = "../util/keyfork-bin", registry = "distrust" } -keyforkd = { version = "0.1.0", path = "../daemon/keyforkd", features = ["tracing"], registry = "distrust" } -keyforkd-client = { version = "0.2.0", path = "../daemon/keyforkd-client", default-features = false, features = ["ed25519"], registry = "distrust" } -keyfork-derive-openpgp = { version = "0.1.1", path = "../derive/keyfork-derive-openpgp", registry = "distrust" } -keyfork-derive-util = { version = "0.2.0", path = "../derive/keyfork-derive-util", default-features = false, features = ["ed25519"], registry = "distrust" } -keyfork-entropy = { version = "0.1.0", path = "../util/keyfork-entropy", registry = "distrust" } -keyfork-mnemonic = { version = "0.3.0", path = "../util/keyfork-mnemonic", registry = "distrust" } -keyfork-prompt = { version = "0.1.0", path = "../util/keyfork-prompt", registry = "distrust" } -keyfork-qrcode = { version = "0.1.0", path = "../qrcode/keyfork-qrcode", default-features = false, registry = "distrust" } -keyfork-shard = { version = "0.2.0", path = "../keyfork-shard", default-features = false, features = ["openpgp", "openpgp-card", "qrcode"], registry = "distrust" } -smex = { version = "0.1.0", path = "../util/smex", registry = "distrust" } +keyfork-bin = { workspace = true } +keyforkd = { workspace = true, features = ["tracing"] } +keyforkd-client = { workspace = true, default-features = false, features = ["ed25519"] } +keyfork-derive-util = { workspace = true, default-features = true } +keyfork-derive-openpgp = { workspace = true } +keyfork-derive-path-data = { workspace = true } +keyfork-entropy = { workspace = true } +keyfork-mnemonic = { workspace = true } +keyfork-prompt = { workspace = true } +keyfork-qrcode = { workspace = true, default-features = false } +keyfork-shard = { workspace = true, default-features = false, features = ["openpgp", "openpgp-card", "qrcode"] } +smex = { workspace = true } clap = { version = "4.4.2", features = ["derive", "env", "wrap_help"] } -thiserror = "1.0.48" -serde = { version = "1.0.192", features = ["derive"] } -tokio = { version = "1.35.1", default-features = false, features = ["rt-multi-thread"] } -card-backend-pcsc = "0.5.0" -openpgp-card-sequoia = { version = "0.2.0", default-features = false } -openpgp-card = "0.4.1" +thiserror = { workspace = true } +serde = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread"] } +card-backend-pcsc = { workspace = true } +openpgp-card-sequoia = { workspace = true } +openpgp-card = { workspace = true } clap_complete = { version = "4.4.6", optional = true } -sequoia-openpgp = { version = "1.17.0", default-features = false, features = ["compression"] } -keyfork-derive-path-data = { version = "0.1.1", path = "../derive/keyfork-derive-path-data" } +sequoia-openpgp = { workspace = true } diff --git a/crates/qrcode/keyfork-qrcode/Cargo.toml b/crates/qrcode/keyfork-qrcode/Cargo.toml index c802864..bd02d90 100644 --- a/crates/qrcode/keyfork-qrcode/Cargo.toml +++ b/crates/qrcode/keyfork-qrcode/Cargo.toml @@ -14,9 +14,9 @@ decode-backend-rqrr = ["dep:rqrr"] decode-backend-zbar = ["dep:keyfork-zbar"] [dependencies] -keyfork-bug = { version = "0.1.0", path = "../../util/keyfork-bug", registry = "distrust" } -keyfork-zbar = { version = "0.1.0", path = "../keyfork-zbar", optional = true, registry = "distrust" } -image = { version = "0.24.7", default-features = false, features = ["jpeg"] } +keyfork-bug = { workspace = true } +keyfork-zbar = { workspace = true, optional = true } +image = { workspace = true, default-features = false, features = ["jpeg"] } rqrr = { version = "0.6.0", optional = true } -thiserror = "1.0.56" -v4l = "0.14.0" +thiserror = { workspace = true } +v4l = { workspace = true } diff --git a/crates/qrcode/keyfork-zbar/Cargo.toml b/crates/qrcode/keyfork-zbar/Cargo.toml index 5a2de21..d9bed34 100644 --- a/crates/qrcode/keyfork-zbar/Cargo.toml +++ b/crates/qrcode/keyfork-zbar/Cargo.toml @@ -13,9 +13,9 @@ bin = ["image"] image = ["dep:image"] [dependencies] -keyfork-zbar-sys = { version = "0.1.0", path = "../keyfork-zbar-sys", registry = "distrust" } -image = { version = "0.24.7", default-features = false, optional = true } -thiserror = "1.0.56" +keyfork-zbar-sys = { workspace = true } +image = { workspace = true, default-features = false, optional = true } +thiserror = { workspace = true } [dev-dependencies] -v4l = "0.14.0" +v4l = { workspace = true } diff --git a/crates/util/keyfork-bin/Cargo.toml b/crates/util/keyfork-bin/Cargo.toml index 49f9a23..22b332e 100644 --- a/crates/util/keyfork-bin/Cargo.toml +++ b/crates/util/keyfork-bin/Cargo.toml @@ -9,4 +9,4 @@ license = "MIT" [dependencies] [dev-dependencies] -anyhow = "1.0.79" +anyhow = { workspace = true } diff --git a/crates/util/keyfork-crossterm/Cargo.toml b/crates/util/keyfork-crossterm/Cargo.toml index 92c86e2..f68cee5 100644 --- a/crates/util/keyfork-crossterm/Cargo.toml +++ b/crates/util/keyfork-crossterm/Cargo.toml @@ -60,11 +60,11 @@ signal-hook-mio = { version = "0.2.3", features = ["support-v0_8"], optional = t # Dev dependencies (examples, ...) [dev-dependencies] -tokio = { version = "1.25", features = ["full"] } +tokio = { workspace = true, features = ["full"] } futures = "0.3" futures-timer = "3.0" async-std = "1.12" -serde_json = "1.0" +serde_json = { workspace = true } serial_test = "2.0.0" # Examples diff --git a/crates/util/keyfork-entropy/Cargo.toml b/crates/util/keyfork-entropy/Cargo.toml index f3b8ead..a568599 100644 --- a/crates/util/keyfork-entropy/Cargo.toml +++ b/crates/util/keyfork-entropy/Cargo.toml @@ -11,5 +11,5 @@ default = ["bin"] bin = ["smex"] [dependencies] -keyfork-bug = { version = "0.1.0", path = "../keyfork-bug", registry = "distrust" } -smex = { version = "0.1.0", path = "../smex", optional = true, registry = "distrust" } +keyfork-bug = { workspace = true } +smex = { workspace = true, optional = true } diff --git a/crates/util/keyfork-frame/Cargo.toml b/crates/util/keyfork-frame/Cargo.toml index 4b9c5ca..6623488 100644 --- a/crates/util/keyfork-frame/Cargo.toml +++ b/crates/util/keyfork-frame/Cargo.toml @@ -12,13 +12,13 @@ async = ["dep:tokio"] [dependencies] # Included in Rust -sha2 = "0.10.7" +sha2 = { workspace = true } # Personally audited -thiserror = "1.0.47" +thiserror = { workspace = true } # Optional, not personally audited -tokio = { version = "1.32.0", optional = true, features = ["io-util"] } +tokio = { workspace = true, optional = true, features = ["io-util"] } [dev-dependencies] insta = "1.31.0" diff --git a/crates/util/keyfork-mnemonic/Cargo.toml b/crates/util/keyfork-mnemonic/Cargo.toml index f1e1b50..c849f28 100644 --- a/crates/util/keyfork-mnemonic/Cargo.toml +++ b/crates/util/keyfork-mnemonic/Cargo.toml @@ -11,14 +11,14 @@ default = ["bin"] bin = ["smex"] [dependencies] -smex = { version = "0.1.0", path = "../smex", optional = true, registry = "distrust" } -keyfork-bug = { version = "0.1.0", path = "../keyfork-bug", registry = "distrust" } +smex = { workspace = true, optional = true } +keyfork-bug = { workspace = true } -sha2 = "0.10.7" -hmac = "0.12.1" +sha2 = { workspace = true } +hmac = { workspace = true } pbkdf2 = "0.12.2" [dev-dependencies] bip39 = "2.0.0" hex = "0.4.3" -serde_json = "1.0.105" +serde_json = { workspace = true } diff --git a/crates/util/keyfork-prompt/Cargo.toml b/crates/util/keyfork-prompt/Cargo.toml index ec4a51b..9169974 100644 --- a/crates/util/keyfork-prompt/Cargo.toml +++ b/crates/util/keyfork-prompt/Cargo.toml @@ -13,7 +13,7 @@ default = ["mnemonic"] mnemonic = ["keyfork-mnemonic"] [dependencies] -keyfork-bug = { version = "0.1.0", path = "../keyfork-bug", registry = "distrust" } -keyfork-crossterm = { version = "0.27.1", path = "../keyfork-crossterm", default-features = false, features = ["use-dev-tty", "events", "bracketed-paste"], registry = "distrust" } -keyfork-mnemonic = { version = "0.3.0", path = "../keyfork-mnemonic", optional = true, registry = "distrust" } -thiserror = "1.0.51" +keyfork-bug = { workspace = true } +keyfork-crossterm = { workspace = true, default-features = false, features = ["use-dev-tty", "events", "bracketed-paste"] } +keyfork-mnemonic = { workspace = true, optional = true } +thiserror = { workspace = true } diff --git a/crates/util/keyfork-slip10-test-data/Cargo.toml b/crates/util/keyfork-slip10-test-data/Cargo.toml index e2c7c49..20c0116 100644 --- a/crates/util/keyfork-slip10-test-data/Cargo.toml +++ b/crates/util/keyfork-slip10-test-data/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" license = "MIT" [dependencies] -smex = { version = "0.1.0", path = "../smex", registry = "distrust" } +smex = { workspace = true } diff --git a/deny.toml b/deny.toml index fff3c5a..55c7f5d 100644 --- a/deny.toml +++ b/deny.toml @@ -255,6 +255,8 @@ skip = [ # dependencies starting at the specified crate, up to a certain depth, which is # by default infinite. skip-tree = [ + { name = "windows-sys" }, + { name = "windows-targets" }, #{ name = "ansi_term", version = "=0.11.0", depth = 20 }, ]