public
/
keyfork
5
0
Fork 0
Code Issues 16 Pull Requests 1 Packages Projects Releases Wiki Activity

reorganize crates

This commit is contained in:
Ryan Heywood 2024-01-15 00:12:34 -05:00
parent 33aeae1177
commit e8f327079b
Signed by: ryan
GPG Key ID: 8E401478A3FBEF72
161 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Cargo.toml
View File

@ -2,26 +2,26 @@
resolver = "2"
members = [
"keyfork",
"keyfork-crossterm",
"keyfork-entropy",
"keyfork-derive-key",
"keyfork-derive-openpgp",
"keyfork-derive-path-data",
"keyfork-derive-util",
"keyfork-frame",
"keyfork-mnemonic-util",
"keyfork-prompt",
"keyfork-plumbing",
"keyfork-shard",
"keyfork-slip10-test-data",
"keyfork-qrcode",
"keyfork-zbar",
"keyfork-zbar-sys",
"keyforkd",
"keyforkd-client",
"keyforkd-models",
"smex",
"crates/keyfork",
"crates/daemon/keyforkd",
"crates/daemon/keyforkd-client",
"crates/daemon/keyforkd-models",
"crates/derive/keyfork-derive-key",
"crates/derive/keyfork-derive-openpgp",
"crates/derive/keyfork-derive-path-data",
"crates/derive/keyfork-derive-util",
"crates/keyfork-shard",
"crates/qrcode/keyfork-qrcode",
"crates/qrcode/keyfork-zbar",
"crates/qrcode/keyfork-zbar-sys",
"crates/util/keyfork-crossterm",
"crates/util/keyfork-entropy",
"crates/util/keyfork-frame",
"crates/util/keyfork-mnemonic-util",
"crates/util/keyfork-prompt",
"crates/util/keyfork-plumbing",
"crates/util/keyfork-slip10-test-data",
"crates/util/smex",
]
[profile.dev.package.keyfork-qrcode]

6
keyforkd-client/Cargo.toml → crates/daemon/keyforkd-client/Cargo.toml
View File

@ -12,14 +12,14 @@ ed25519 = ["keyfork-derive-util/ed25519"]
secp256k1 = ["keyfork-derive-util/secp256k1"]
[dependencies]
keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false }
keyfork-frame = { version = "0.1.0", path = "../keyfork-frame" }
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" }
bincode = "1.3.3"
thiserror = "1.0.49"
[dev-dependencies]
keyfork-slip10-test-data = { path = "../keyfork-slip10-test-data" }
keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data" }
keyforkd = { path = "../keyforkd" }
tempfile = "3.9.0"
tokio = { version = "1.32.0", features = ["rt", "sync", "rt-multi-thread"] }

0
keyforkd-client/src/lib.rs → crates/daemon/keyforkd-client/src/lib.rs
View File

0
keyforkd-client/src/tests.rs → crates/daemon/keyforkd-client/src/tests.rs
View File

2
keyforkd-models/Cargo.toml → crates/daemon/keyforkd-models/Cargo.toml
View File

@ -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 = "../keyfork-derive-util", default-features = false }
keyfork-derive-util = { version = "0.1.0", path = "../../derive/keyfork-derive-util", default-features = false }
serde = { version = "1.0.190", features = ["derive"] }
thiserror = "1.0.50"

0
keyforkd-models/src/lib.rs → crates/daemon/keyforkd-models/src/lib.rs
View File

10
keyforkd/Cargo.toml → crates/daemon/keyforkd/Cargo.toml
View File

@ -12,10 +12,10 @@ tracing = ["tower/tracing", "tokio/tracing", "dep:tracing", "dep:tracing-subscri
multithread = ["tokio/rt-multi-thread"]
[dependencies]
keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util" }
keyfork-frame = { version = "0.1.0", path = "../keyfork-frame" }
keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
keyfork-derive-path-data = { version = "0.1.0", path = "../keyfork-derive-path-data" }
keyfork-derive-util = { version = "0.1.0", path = "../../derive/keyfork-derive-util" }
keyfork-frame = { version = "0.1.0", path = "../../util/keyfork-frame" }
keyfork-mnemonic-util = { version = "0.1.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" }
# Not personally audited
@ -34,4 +34,4 @@ serde = { version = "1.0.186", features = ["derive"] }
[dev-dependencies]
hex-literal = "0.4.1"
keyfork-slip10-test-data = { path = "../keyfork-slip10-test-data" }
keyfork-slip10-test-data = { path = "../../util/keyfork-slip10-test-data" }

0
keyforkd/src/error.rs → crates/daemon/keyforkd/src/error.rs
View File

0
keyforkd/src/lib.rs → crates/daemon/keyforkd/src/lib.rs
View File

0
keyforkd/src/main.rs → crates/daemon/keyforkd/src/main.rs
View File

0
keyforkd/src/middleware.rs → crates/daemon/keyforkd/src/middleware.rs
View File

0
keyforkd/src/server.rs → crates/daemon/keyforkd/src/server.rs
View File

0
keyforkd/src/service.rs → crates/daemon/keyforkd/src/service.rs
View File

4
keyfork-derive-key/Cargo.toml → crates/derive/keyfork-derive-key/Cargo.toml
View File

@ -8,6 +8,6 @@ license = "AGPL-3.0-only"
[dependencies]
keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util" }
keyforkd-client = { version = "0.1.0", path = "../keyforkd-client" }
smex = { version = "0.1.0", path = "../smex" }
keyforkd-client = { version = "0.1.0", path = "../../daemon/keyforkd-client" }
smex = { version = "0.1.0", path = "../../util/smex" }
thiserror = "1.0.48"

0
keyfork-derive-key/src/main.rs → crates/derive/keyfork-derive-key/src/main.rs
View File

2
keyfork-derive-openpgp/Cargo.toml → crates/derive/keyfork-derive-openpgp/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "AGPL-3.0-only"
[dependencies]
keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false, features = ["ed25519"] }
keyforkd-client = { version = "0.1.0", path = "../keyforkd-client", default-features = false, features = ["ed25519"] }
keyforkd-client = { version = "0.1.0", path = "../../daemon/keyforkd-client", default-features = false, features = ["ed25519"] }
ed25519-dalek = "2.0.0"
sequoia-openpgp = { version = "1.17.0", default-features = false }
anyhow = "1.0.75"

0
keyfork-derive-openpgp/src/lib.rs → crates/derive/keyfork-derive-openpgp/src/lib.rs
View File

0
keyfork-derive-openpgp/src/main.rs → crates/derive/keyfork-derive-openpgp/src/main.rs
View File

0
keyfork-derive-path-data/Cargo.toml → crates/derive/keyfork-derive-path-data/Cargo.toml
View File

0
keyfork-derive-path-data/src/lib.rs → crates/derive/keyfork-derive-path-data/src/lib.rs
View File

4
keyfork-derive-util/Cargo.toml → crates/derive/keyfork-derive-util/Cargo.toml
View File

@ -12,7 +12,7 @@ secp256k1 = ["k256"]
ed25519 = ["ed25519-dalek"]
[dependencies]
keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
keyfork-mnemonic-util = { version = "0.1.0", path = "../../util/keyfork-mnemonic-util" }
# Included in Rust
digest = "0.10.7"
@ -32,4 +32,4 @@ ed25519-dalek = { version = "2.0.0", optional = true }
[dev-dependencies]
hex-literal = "0.4.1"
keyfork-slip10-test-data = { version = "0.1.0", path = "../keyfork-slip10-test-data" }
keyfork-slip10-test-data = { version = "0.1.0", path = "../../util/keyfork-slip10-test-data" }

0
keyfork-derive-util/src/extended_key/mod.rs → crates/derive/keyfork-derive-util/src/extended_key/mod.rs
View File

0
keyfork-derive-util/src/extended_key/private_key.rs → crates/derive/keyfork-derive-util/src/extended_key/private_key.rs
View File

0
keyfork-derive-util/src/extended_key/public_key.rs → crates/derive/keyfork-derive-util/src/extended_key/public_key.rs
View File

0
keyfork-derive-util/src/index.rs → crates/derive/keyfork-derive-util/src/index.rs
View File

0
keyfork-derive-util/src/lib.rs → crates/derive/keyfork-derive-util/src/lib.rs
View File

0
keyfork-derive-util/src/path.rs → crates/derive/keyfork-derive-util/src/path.rs
View File

0
keyfork-derive-util/src/private_key.rs → crates/derive/keyfork-derive-util/src/private_key.rs
View File

0
keyfork-derive-util/src/public_key.rs → crates/derive/keyfork-derive-util/src/public_key.rs
View File

0
keyfork-derive-util/src/request.rs → crates/derive/keyfork-derive-util/src/request.rs
View File

0
keyfork-derive-util/src/tests.rs → crates/derive/keyfork-derive-util/src/tests.rs
View File

10
keyfork-shard/Cargo.toml → crates/keyfork-shard/Cargo.toml
View File

@ -13,22 +13,22 @@ openpgp-card = ["openpgp-card-sequoia", "card-backend-pcsc", "card-backend", "de
qrcode = ["keyfork-qrcode"]
[dependencies]
keyfork-prompt = { version = "0.1.0", path = "../keyfork-prompt", default-features = false, features = ["mnemonic"] }
keyfork-qrcode = { version = "0.1.0", path = "../keyfork-qrcode", optional = true }
smex = { version = "0.1.0", path = "../smex" }
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 }
smex = { version = "0.1.0", path = "../util/smex" }
sharks = "0.5.0"
thiserror = "1.0.50"
# Remote operator mode
keyfork-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
keyfork-mnemonic-util = { version = "0.1.0", path = "../util/keyfork-mnemonic-util" }
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 = "../keyfork-derive-openpgp" }
keyfork-derive-openpgp = { version = "0.1.0", path = "../derive/keyfork-derive-openpgp" }
anyhow = { version = "1.0.79", optional = true }
card-backend = { version = "0.2.0", optional = true }
card-backend-pcsc = { version = "0.5.0", optional = true }

0
keyfork-shard/src/bin/keyfork-shard-combine-openpgp.rs → crates/keyfork-shard/src/bin/keyfork-shard-combine-openpgp.rs
View File

0
keyfork-shard/src/bin/keyfork-shard-decrypt-openpgp.rs → crates/keyfork-shard/src/bin/keyfork-shard-decrypt-openpgp.rs
View File

0
keyfork-shard/src/bin/keyfork-shard-remote.rs → crates/keyfork-shard/src/bin/keyfork-shard-remote.rs
View File

0
keyfork-shard/src/bin/keyfork-shard-split-openpgp.rs → crates/keyfork-shard/src/bin/keyfork-shard-split-openpgp.rs
View File

0
keyfork-shard/src/lib.rs → crates/keyfork-shard/src/lib.rs
View File

0
keyfork-shard/src/openpgp.rs → crates/keyfork-shard/src/openpgp.rs
View File

0
keyfork-shard/src/openpgp/keyring.rs → crates/keyfork-shard/src/openpgp/keyring.rs
View File

0
keyfork-shard/src/openpgp/smartcard.rs → crates/keyfork-shard/src/openpgp/smartcard.rs
View File

21
keyfork/Cargo.toml → crates/keyfork/Cargo.toml
View File

@ -23,22 +23,23 @@ 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-mnemonic-util = { version = "0.1.0", path = "../keyfork-mnemonic-util" }
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.1.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" }
keyfork-shard = { version = "0.1.0", path = "../keyfork-shard" }
smex = { version = "0.1.0", path = "../util/smex" }
clap = { version = "4.4.2", features = ["derive", "env", "wrap_help"] }
thiserror = "1.0.48"
smex = { version = "0.1.0", path = "../smex" }
keyfork-shard = { version = "0.1.0", path = "../keyfork-shard" }
serde = { version = "1.0.192", features = ["derive"] }
keyforkd = { version = "0.1.0", path = "../keyforkd", features = ["tracing"] }
tokio = { version = "1.35.1", default-features = false, features = ["rt-multi-thread"] }
keyfork-derive-openpgp = { version = "0.1.0", path = "../keyfork-derive-openpgp" }
keyforkd-client = { version = "0.1.0", path = "../keyforkd-client", default-features = false, features = ["ed25519"] }
keyfork-derive-util = { version = "0.1.0", path = "../keyfork-derive-util", default-features = false, features = ["ed25519"] }
card-backend-pcsc = "0.5.0"
openpgp-card-sequoia = { version = "0.2.0", default-features = false }
openpgp-card = "0.4.1"
keyfork-prompt = { version = "0.1.0", path = "../keyfork-prompt" }
keyfork-entropy = { version = "0.1.0", path = "../keyfork-entropy" }
clap_complete = { version = "4.4.6", optional = true }
keyfork-qrcode = { version = "0.1.0", path = "../keyfork-qrcode" }
sequoia-openpgp = { version = "1.17.0", default-features = false, features = ["compression"] }

0
keyfork/src/cli/derive.rs → crates/keyfork/src/cli/derive.rs
View File

0
keyfork/src/cli/mnemonic.rs → crates/keyfork/src/cli/mnemonic.rs
View File

0
keyfork/src/cli/mod.rs → crates/keyfork/src/cli/mod.rs
View File

0
keyfork/src/cli/provision/mod.rs → crates/keyfork/src/cli/provision/mod.rs
View File

0
keyfork/src/cli/recover.rs → crates/keyfork/src/cli/recover.rs
View File

0
keyfork/src/cli/shard.rs → crates/keyfork/src/cli/shard.rs
View File

0
keyfork/src/cli/wizard.rs → crates/keyfork/src/cli/wizard.rs
View File

0
keyfork/src/config.rs → crates/keyfork/src/config.rs
View File

0
keyfork/src/main.rs → crates/keyfork/src/main.rs
View File

0
keyfork-qrcode/Cargo.toml → crates/qrcode/keyfork-qrcode/Cargo.toml
View File

0
keyfork-qrcode/src/bin/keyfork-qrcode-scan.rs → crates/qrcode/keyfork-qrcode/src/bin/keyfork-qrcode-scan.rs
View File

0
keyfork-qrcode/src/lib.rs → crates/qrcode/keyfork-qrcode/src/lib.rs
View File

0
keyfork-zbar-sys/Cargo.toml → crates/qrcode/keyfork-zbar-sys/Cargo.toml
View File

0
keyfork-zbar-sys/build.rs → crates/qrcode/keyfork-zbar-sys/build.rs
View File

0
keyfork-zbar-sys/src/lib.rs → crates/qrcode/keyfork-zbar-sys/src/lib.rs
View File

0
keyfork-zbar-sys/zbar-wrapper.h → crates/qrcode/keyfork-zbar-sys/zbar-wrapper.h
View File

0
keyfork-zbar/Cargo.toml → crates/qrcode/keyfork-zbar/Cargo.toml
View File

0
keyfork-zbar/examples/v4l-scan.rs → crates/qrcode/keyfork-zbar/examples/v4l-scan.rs
View File

0
keyfork-zbar/src/image.rs → crates/qrcode/keyfork-zbar/src/image.rs
View File

0
keyfork-zbar/src/image_scanner.rs → crates/qrcode/keyfork-zbar/src/image_scanner.rs
View File

0
keyfork-zbar/src/lib.rs → crates/qrcode/keyfork-zbar/src/lib.rs
View File

0
keyfork-zbar/src/symbol.rs → crates/qrcode/keyfork-zbar/src/symbol.rs
View File

0
keyfork-crossterm/.travis.yml → crates/util/keyfork-crossterm/.travis.yml
View File

0
keyfork-crossterm/CHANGELOG.md → crates/util/keyfork-crossterm/CHANGELOG.md
View File

0
keyfork-crossterm/Cargo.toml → crates/util/keyfork-crossterm/Cargo.toml
View File

0
keyfork-crossterm/LICENSE → crates/util/keyfork-crossterm/LICENSE
View File

0
keyfork-crossterm/README.md → crates/util/keyfork-crossterm/README.md
View File

0
keyfork-crossterm/README.md.old → crates/util/keyfork-crossterm/README.md.old
View File

0
keyfork-crossterm/docs/.gitignore → crates/util/keyfork-crossterm/docs/.gitignore vendored
View File

0
keyfork-crossterm/docs/CONTRIBUTING.md → crates/util/keyfork-crossterm/docs/CONTRIBUTING.md
View File

0
keyfork-crossterm/docs/crossterm_c.png → crates/util/keyfork-crossterm/docs/crossterm_c.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

0
keyfork-crossterm/docs/crossterm_full.png → crates/util/keyfork-crossterm/docs/crossterm_full.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
keyfork-crossterm/docs/crossterm_full.svg → crates/util/keyfork-crossterm/docs/crossterm_full.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

0
keyfork-crossterm/docs/know-problems.md → crates/util/keyfork-crossterm/docs/know-problems.md
View File

0
keyfork-crossterm/examples/README.md → crates/util/keyfork-crossterm/examples/README.md
View File

0
keyfork-crossterm/examples/event-match-modifiers.rs → crates/util/keyfork-crossterm/examples/event-match-modifiers.rs
View File

0
keyfork-crossterm/examples/event-poll-read.rs → crates/util/keyfork-crossterm/examples/event-poll-read.rs
View File

0
keyfork-crossterm/examples/event-read-char-line.rs → crates/util/keyfork-crossterm/examples/event-read-char-line.rs
View File

0
keyfork-crossterm/examples/event-read.rs → crates/util/keyfork-crossterm/examples/event-read.rs
View File

0
keyfork-crossterm/examples/event-stream-async-std.rs → crates/util/keyfork-crossterm/examples/event-stream-async-std.rs
View File

0
keyfork-crossterm/examples/event-stream-tokio.rs → crates/util/keyfork-crossterm/examples/event-stream-tokio.rs
View File

0
keyfork-crossterm/examples/interactive-demo/Cargo.toml → crates/util/keyfork-crossterm/examples/interactive-demo/Cargo.toml
View File

0
keyfork-crossterm/examples/interactive-demo/src/macros.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/macros.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/main.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/main.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/test.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/test.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/test/attribute.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/test/attribute.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/test/color.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/test/color.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/test/cursor.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/test/cursor.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/test/event.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/test/event.rs
View File

0
keyfork-crossterm/examples/interactive-demo/src/test/synchronized_output.rs → crates/util/keyfork-crossterm/examples/interactive-demo/src/test/synchronized_output.rs
View File

0
keyfork-crossterm/examples/is_tty.rs → crates/util/keyfork-crossterm/examples/is_tty.rs
View File

0
keyfork-crossterm/examples/stderr.rs → crates/util/keyfork-crossterm/examples/stderr.rs
View File

0
keyfork-crossterm/src/ansi_support.rs → crates/util/keyfork-crossterm/src/ansi_support.rs
View File

0
keyfork-crossterm/src/command.rs → crates/util/keyfork-crossterm/src/command.rs
View File

0
keyfork-crossterm/src/cursor.rs → crates/util/keyfork-crossterm/src/cursor.rs
View File

0
keyfork-crossterm/src/cursor/sys.rs → crates/util/keyfork-crossterm/src/cursor/sys.rs
View File

0
keyfork-crossterm/src/cursor/sys/unix.rs → crates/util/keyfork-crossterm/src/cursor/sys/unix.rs
View File

0
keyfork-crossterm/src/cursor/sys/windows.rs → crates/util/keyfork-crossterm/src/cursor/sys/windows.rs
View File

0
keyfork-crossterm/src/event.rs → crates/util/keyfork-crossterm/src/event.rs
View File

Some files were not shown because too many files have changed in this diff Show More