Skip to content

factor out repetition #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mxcl merged 2 commits into from
Jun 11, 2025
Merged

factor out repetition #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ac821
factor out repetition
jhheider Jun 10, 2025
e48856c
comments never hurt anyone
jhheider Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions bpb/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,26 +105,29 @@ fn generate_keypair(userid: String) -> Result<(), Error> {
Ok(())
}

fn print_public_key() -> Result<(), Error> {
// Does most of the initial setup
// used for quite a few of the subcommands
//
// - Loads the config
// - Gets the keypair from the keychain
fn get_keypair() -> Result<KeyData, Error> {
let config = Config::load()?;
let service = config.service();
let account = config.user_id();
let secret_str = get_keychain_item(service, account)?;
let secret = to_32_bytes(&secret_str)?;

let keypair = KeyData::load(&config, secret)?;
KeyData::load(&config, secret)
}

fn print_public_key() -> Result<(), Error> {
let keypair = get_keypair()?;
println!("{}", keypair.public());
Ok(())
}

fn get_fingerprint() -> Result<pbp::Fingerprint, Error> {
let config = Config::load()?;
let service = config.service();
let account = config.user_id();
let secret_str = get_keychain_item(service, account)?;
let secret = to_32_bytes(&secret_str)?;

let keypair = KeyData::load(&config, secret)?;
let keypair = get_keypair()?;
Ok(keypair.fingerprint())
}

Expand All @@ -147,14 +150,7 @@ fn verify_commit() -> Result<(), Error> {
let mut stdin = std::io::stdin();
stdin.read_to_string(&mut commit)?;

let config = Config::load()?;
let service = config.service();
let account = config.user_id();
let secret_str = get_keychain_item(service, account)?;
let secret = to_32_bytes(&secret_str)?;

let config = Config::load()?;
let keypair = KeyData::load(&config, secret)?;
let keypair = get_keypair()?;

let sig = keypair.sign(commit.as_bytes())?;

Expand All @@ -165,13 +161,7 @@ fn verify_commit() -> Result<(), Error> {

// Signs a hex string and prints the signature
fn sign_from_hex(hex: String) -> Result<(), Error> {
let config = Config::load()?;
let service = config.service();
let account = config.user_id();
let secret_str = get_keychain_item(service, account)?;
let secret = to_32_bytes(&secret_str)?;

let keypair = KeyData::load(&config, secret)?;
let keypair = get_keypair()?;
// remove any leading 0x prefix
let hex = hex.trim().to_lowercase();
let hex = hex.trim_start_matches("0x");
Expand Down
Loading