Compare commits

..

No commits in common. "d7bf3d16e14ca236185860c2a6b777e6d8280d72" and "6a3244df01fd6b61e8f763918c73a9f6d1a2c087" have entirely different histories.

9 changed files with 475 additions and 299 deletions

1
.gitattributes vendored
View File

@ -1 +0,0 @@
audits filter=lfs diff=lfs merge=lfs -text

764
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -31,6 +31,7 @@ members = [
keyforkd = { version = "0.1.1", path = "crates/daemon/keyforkd", registry = "distrust", default-features = false } 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-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 } 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-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-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-derive-util = { version = "0.2.0", path = "crates/derive/keyfork-derive-util", registry = "distrust", default-features = false }

Binary file not shown.

View File

@ -18,6 +18,8 @@ keyfork-bug = { workspace = true }
keyfork-prompt = { workspace = true, default-features = false, features = ["mnemonic"] } keyfork-prompt = { workspace = true, default-features = false, features = ["mnemonic"] }
keyfork-qrcode = { workspace = true, optional = true, default-features = false } keyfork-qrcode = { workspace = true, optional = true, default-features = false }
smex = { workspace = true } smex = { workspace = true }
sharks = "0.5.0"
thiserror = { workspace = true } thiserror = { workspace = true }
# Remote operator mode # Remote operator mode
@ -36,4 +38,3 @@ openpgp-card-sequoia = { workspace = true, optional = true }
openpgp-card = { workspace = true, optional = true } openpgp-card = { workspace = true, optional = true }
sequoia-openpgp = { workspace = true, optional = true } sequoia-openpgp = { workspace = true, optional = true }
base64 = "0.22.0" base64 = "0.22.0"
blahaj = "0.6.0"

View File

@ -22,7 +22,7 @@ use keyfork_prompt::{
Message as PromptMessage, PromptHandler, Terminal, Message as PromptMessage, PromptHandler, Terminal,
}; };
use sha2::Sha256; use sha2::Sha256;
use blahaj::{Share, Sharks}; use sharks::{Share, Sharks};
use x25519_dalek::{EphemeralSecret, PublicKey}; use x25519_dalek::{EphemeralSecret, PublicKey};
const PLAINTEXT_LENGTH: u8 = 32 // shard const PLAINTEXT_LENGTH: u8 = 32 // shard

View File

@ -34,7 +34,7 @@ use openpgp::{
KeyID, PacketPile, KeyID, PacketPile,
}; };
pub use sequoia_openpgp as openpgp; pub use sequoia_openpgp as openpgp;
use blahaj::Share; use sharks::Share;
mod keyring; mod keyring;
use keyring::Keyring; use keyring::Keyring;

View File

@ -114,7 +114,6 @@ exceptions = [
# list # list
#{ allow = ["Zlib"], crate = "adler32" }, #{ allow = ["Zlib"], crate = "adler32" },
{ allow = ["BSL-1.0"], name = "xxhash-rust", version = "*" }, { allow = ["BSL-1.0"], name = "xxhash-rust", version = "*" },
{ allow = ["Zlib"], name = "foldhash", version = "*" },
] ]
# Some crates don't have (easily) machine readable licensing information, # Some crates don't have (easily) machine readable licensing information,