From 752138bd352e00d5727b20b3f66ad368ebfe9d38 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 22 Feb 2024 21:58:49 -0500 Subject: [PATCH] crates: specify registry = distrust --- crates/daemon/keyforkd-client/Cargo.toml | 10 ++++----- crates/daemon/keyforkd-models/Cargo.toml | 2 +- crates/daemon/keyforkd/Cargo.toml | 14 ++++++------ crates/derive/keyfork-derive-key/Cargo.toml | 6 ++--- .../derive/keyfork-derive-openpgp/Cargo.toml | 6 ++--- .../keyfork-derive-path-data/Cargo.toml | 2 +- crates/derive/keyfork-derive-util/Cargo.toml | 6 ++--- crates/keyfork-shard/Cargo.toml | 12 +++++----- crates/keyfork/Cargo.toml | 22 +++++++++---------- crates/qrcode/keyfork-qrcode/Cargo.toml | 4 ++-- crates/qrcode/keyfork-zbar/Cargo.toml | 2 +- crates/util/keyfork-entropy/Cargo.toml | 4 ++-- crates/util/keyfork-mnemonic-util/Cargo.toml | 7 +++--- crates/util/keyfork-prompt/Cargo.toml | 6 ++--- .../util/keyfork-slip10-test-data/Cargo.toml | 2 +- 15 files changed, 52 insertions(+), 53 deletions(-) diff --git a/crates/daemon/keyforkd-client/Cargo.toml b/crates/daemon/keyforkd-client/Cargo.toml index 2d23161..14874a5 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.1.0", path = "../../derive/keyfork-derive-util", default-features = false } -keyfork-frame = { version = "0.1.0", path = "../../util/keyfork-frame" } -keyforkd-models = { version = "0.1.0", path = "../keyforkd-models" } +keyfork-derive-util = { version = "0.1.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.1.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 } [dev-dependencies] -keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data" } -keyforkd = { path = "../keyforkd" } +keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data", registry = "distrust" } +keyforkd = { path = "../keyforkd", registry = "distrust" } diff --git a/crates/daemon/keyforkd-models/Cargo.toml b/crates/daemon/keyforkd-models/Cargo.toml index 498737d..1ef13cd 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.1.0", path = "../../derive/keyfork-derive-util", default-features = false } +keyfork-derive-util = { version = "0.1.0", path = "../../derive/keyfork-derive-util", default-features = false, registry = "distrust" } serde = { version = "1.0.190", features = ["derive"] } thiserror = "1.0.50" diff --git a/crates/daemon/keyforkd/Cargo.toml b/crates/daemon/keyforkd/Cargo.toml index 21054ca..c1ed74b 100644 --- a/crates/daemon/keyforkd/Cargo.toml +++ b/crates/daemon/keyforkd/Cargo.toml @@ -12,12 +12,12 @@ 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" } -keyfork-derive-util = { version = "0.1.0", path = "../../derive/keyfork-derive-util" } -keyfork-frame = { version = "0.1.0", path = "../../util/keyfork-frame", features = ["async"] } -keyfork-mnemonic-util = { version = "0.2.0", path = "../../util/keyfork-mnemonic-util" } -keyfork-derive-path-data = { version = "0.1.0", path = "../../derive/keyfork-derive-path-data" } -keyforkd-models = { version = "0.1.0", path = "../keyforkd-models" } +keyfork-bug = { version = "0.1.0", path = "../../util/keyfork-bug", registry = "distrust" } +keyfork-derive-util = { version = "0.1.0", path = "../../derive/keyfork-derive-util", registry = "distrust" } +keyfork-frame = { version = "0.1.0", path = "../../util/keyfork-frame", features = ["async"], registry = "distrust" } +keyfork-mnemonic-util = { version = "0.2.0", path = "../../util/keyfork-mnemonic-util", registry = "distrust" } +keyfork-derive-path-data = { version = "0.1.0", path = "../../derive/keyfork-derive-path-data", registry = "distrust" } +keyforkd-models = { version = "0.1.0", path = "../keyforkd-models", registry = "distrust" } # Not personally audited bincode = "1.3.3" @@ -36,4 +36,4 @@ 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" } +keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data", registry = "distrust" } diff --git a/crates/derive/keyfork-derive-key/Cargo.toml b/crates/derive/keyfork-derive-key/Cargo.toml index 1c30a34..f3a9159 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.1.0", path = "../keyfork-derive-util" } -keyforkd-client = { version = "0.1.0", path = "../../daemon/keyforkd-client" } -smex = { version = "0.1.0", path = "../../util/smex" } +keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", registry = "distrust" } +keyforkd-client = { version = "0.1.0", path = "../../daemon/keyforkd-client", registry = "distrust" } +smex = { version = "0.1.0", path = "../../util/smex", registry = "distrust" } thiserror = "1.0.48" diff --git a/crates/derive/keyfork-derive-openpgp/Cargo.toml b/crates/derive/keyfork-derive-openpgp/Cargo.toml index 1080104..b40805e 100644 --- a/crates/derive/keyfork-derive-openpgp/Cargo.toml +++ b/crates/derive/keyfork-derive-openpgp/Cargo.toml @@ -6,12 +6,12 @@ license = "AGPL-3.0-only" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -default = [] +default = ["bin"] bin = ["sequoia-openpgp/crypto-nettle"] [dependencies] -keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false, features = ["ed25519"] } -keyforkd-client = { version = "0.1.0", path = "../../daemon/keyforkd-client", default-features = false, features = ["ed25519"] } +keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false, features = ["ed25519"], registry = "distrust" } +keyforkd-client = { version = "0.1.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" diff --git a/crates/derive/keyfork-derive-path-data/Cargo.toml b/crates/derive/keyfork-derive-path-data/Cargo.toml index 151a3de..07e51d8 100644 --- a/crates/derive/keyfork-derive-path-data/Cargo.toml +++ b/crates/derive/keyfork-derive-path-data/Cargo.toml @@ -7,4 +7,4 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false } +keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false, registry = "distrust" } diff --git a/crates/derive/keyfork-derive-util/Cargo.toml b/crates/derive/keyfork-derive-util/Cargo.toml index f46a321..4c208cd 100644 --- a/crates/derive/keyfork-derive-util/Cargo.toml +++ b/crates/derive/keyfork-derive-util/Cargo.toml @@ -12,7 +12,8 @@ secp256k1 = ["k256"] ed25519 = ["ed25519-dalek"] [dependencies] -keyfork-mnemonic-util = { version = "0.2.0", path = "../../util/keyfork-mnemonic-util" } +keyfork-mnemonic-util = { version = "0.2.0", path = "../../util/keyfork-mnemonic-util", registry = "distrust" } +keyfork-bug = { version = "0.1.0", path = "../../util/keyfork-bug", registry = "distrust" } # Included in Rust digest = "0.10.7" @@ -29,8 +30,7 @@ thiserror = "1.0.47" # 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 } -keyfork-bug = { version = "0.1.0", path = "../../util/keyfork-bug" } [dev-dependencies] hex-literal = "0.4.1" -keyfork-slip10-test-data = { version = "0.1.0", path = "../../util/keyfork-slip10-test-data" } +keyfork-slip10-test-data = { version = "0.1.0", path = "../../util/keyfork-slip10-test-data", registry = "distrust" } diff --git a/crates/keyfork-shard/Cargo.toml b/crates/keyfork-shard/Cargo.toml index 848e170..6cdd0c0 100644 --- a/crates/keyfork-shard/Cargo.toml +++ b/crates/keyfork-shard/Cargo.toml @@ -14,26 +14,26 @@ openpgp-card = ["openpgp-card-sequoia", "card-backend-pcsc", "card-backend", "de qrcode = ["keyfork-qrcode"] [dependencies] -keyfork-prompt = { version = "0.1.0", path = "../util/keyfork-prompt", default-features = false, features = ["mnemonic"] } -keyfork-qrcode = { version = "0.1.0", path = "../qrcode/keyfork-qrcode", optional = true, default-features = false } -smex = { version = "0.1.0", path = "../util/smex" } +keyfork-bug = { version = "0.1.0", path = "../util/keyfork-bug", registry = "distrust" } +keyfork-prompt = { version = "0.1.0", path = "../util/keyfork-prompt", default-features = false, features = ["mnemonic"], registry = "distrust" } +keyfork-qrcode = { version = "0.1.0", path = "../qrcode/keyfork-qrcode", optional = true, default-features = false, registry = "distrust" } +smex = { version = "0.1.0", path = "../util/smex", registry = "distrust" } sharks = "0.5.0" thiserror = "1.0.50" # Remote operator mode -keyfork-mnemonic-util = { version = "0.2.0", path = "../util/keyfork-mnemonic-util" } +keyfork-mnemonic-util = { version = "0.2.0", path = "../util/keyfork-mnemonic-util", registry = "distrust" } 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" # OpenPGP -keyfork-derive-openpgp = { version = "0.1.0", path = "../derive/keyfork-derive-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 } 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 } -keyfork-bug = { version = "0.1.0", path = "../util/keyfork-bug" } diff --git a/crates/keyfork/Cargo.toml b/crates/keyfork/Cargo.toml index b1309a7..bc3bda2 100644 --- a/crates/keyfork/Cargo.toml +++ b/crates/keyfork/Cargo.toml @@ -23,16 +23,17 @@ 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] -keyforkd = { version = "0.1.0", path = "../daemon/keyforkd", features = ["tracing"] } -keyforkd-client = { version = "0.1.0", path = "../daemon/keyforkd-client", default-features = false, features = ["ed25519"] } -keyfork-derive-openpgp = { version = "0.1.0", path = "../derive/keyfork-derive-openpgp" } -keyfork-derive-util = { version = "0.1.0", path = "../derive/keyfork-derive-util", default-features = false, features = ["ed25519"] } -keyfork-entropy = { version = "0.1.0", path = "../util/keyfork-entropy" } -keyfork-mnemonic-util = { version = "0.2.0", path = "../util/keyfork-mnemonic-util" } -keyfork-prompt = { version = "0.1.0", path = "../util/keyfork-prompt" } -keyfork-qrcode = { version = "0.1.0", path = "../qrcode/keyfork-qrcode", default-features = false } -keyfork-shard = { version = "0.1.0", path = "../keyfork-shard", default-features = false, features = ["openpgp", "openpgp-card", "qrcode"] } -smex = { version = "0.1.0", path = "../util/smex" } +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.1.0", path = "../daemon/keyforkd-client", default-features = false, features = ["ed25519"], registry = "distrust" } +keyfork-derive-openpgp = { version = "0.1.0", path = "../derive/keyfork-derive-openpgp", registry = "distrust" } +keyfork-derive-util = { version = "0.1.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-util = { version = "0.2.0", path = "../util/keyfork-mnemonic-util", 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.1.0", path = "../keyfork-shard", default-features = false, features = ["openpgp", "openpgp-card", "qrcode"], registry = "distrust" } +smex = { version = "0.1.0", path = "../util/smex", registry = "distrust" } clap = { version = "4.4.2", features = ["derive", "env", "wrap_help"] } thiserror = "1.0.48" @@ -43,4 +44,3 @@ openpgp-card-sequoia = { version = "0.2.0", default-features = false } openpgp-card = "0.4.1" clap_complete = { version = "4.4.6", optional = true } sequoia-openpgp = { version = "1.17.0", default-features = false, features = ["compression"] } -keyfork-bin = { version = "0.1.0", path = "../util/keyfork-bin" } diff --git a/crates/qrcode/keyfork-qrcode/Cargo.toml b/crates/qrcode/keyfork-qrcode/Cargo.toml index 167f3ea..cb36920 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 = { version = "0.1.0", path = "../../util/keyfork-bug" } -keyfork-zbar = { version = "0.1.0", path = "../keyfork-zbar", optional = true } rqrr = { version = "0.6.0", optional = true } thiserror = "1.0.56" v4l = "0.14.0" diff --git a/crates/qrcode/keyfork-zbar/Cargo.toml b/crates/qrcode/keyfork-zbar/Cargo.toml index ad3c37a..d1efa96 100644 --- a/crates/qrcode/keyfork-zbar/Cargo.toml +++ b/crates/qrcode/keyfork-zbar/Cargo.toml @@ -12,8 +12,8 @@ default = ["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 } -keyfork-zbar-sys = { version = "0.1.0", path = "../keyfork-zbar-sys" } thiserror = "1.0.56" [dev-dependencies] diff --git a/crates/util/keyfork-entropy/Cargo.toml b/crates/util/keyfork-entropy/Cargo.toml index 2573746..dd1100f 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" } -smex = { version = "0.1.0", path = "../smex", optional = true } +keyfork-bug = { version = "0.1.0", path = "../keyfork-bug", registry = "distrust" } +smex = { version = "0.1.0", path = "../smex", optional = true, registry = "distrust" } diff --git a/crates/util/keyfork-mnemonic-util/Cargo.toml b/crates/util/keyfork-mnemonic-util/Cargo.toml index 1e0ce66..e3ce7e3 100644 --- a/crates/util/keyfork-mnemonic-util/Cargo.toml +++ b/crates/util/keyfork-mnemonic-util/Cargo.toml @@ -11,13 +11,12 @@ default = ["bin"] bin = ["smex"] [dependencies] -# Included in rust -sha2 = "0.10.7" +smex = { version = "0.1.0", path = "../smex", optional = true, registry = "distrust" } +keyfork-bug = { version = "0.1.0", path = "../keyfork-bug", registry = "distrust" } +sha2 = "0.10.7" hmac = "0.12.1" pbkdf2 = "0.12.2" -smex = { version = "0.1.0", path = "../smex", optional = true } -keyfork-bug = { version = "0.1.0", path = "../keyfork-bug" } [dev-dependencies] bip39 = "2.0.0" diff --git a/crates/util/keyfork-prompt/Cargo.toml b/crates/util/keyfork-prompt/Cargo.toml index fecdd25..826e6e1 100644 --- a/crates/util/keyfork-prompt/Cargo.toml +++ b/crates/util/keyfork-prompt/Cargo.toml @@ -13,7 +13,7 @@ default = ["mnemonic"] mnemonic = ["keyfork-mnemonic-util"] [dependencies] -keyfork-bug = { version = "0.1.0", path = "../keyfork-bug" } -keyfork-crossterm = { version = "0.27.1", path = "../keyfork-crossterm", default-features = false, features = ["use-dev-tty", "events", "bracketed-paste"] } -keyfork-mnemonic-util = { version = "0.2.0", path = "../keyfork-mnemonic-util", optional = true } +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-util = { version = "0.2.0", path = "../keyfork-mnemonic-util", optional = true, registry = "distrust" } thiserror = "1.0.51" diff --git a/crates/util/keyfork-slip10-test-data/Cargo.toml b/crates/util/keyfork-slip10-test-data/Cargo.toml index 153f04a..e2c7c49 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" } +smex = { version = "0.1.0", path = "../smex", registry = "distrust" }