turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

opgpcard: Unify on aut-fp not auth-fp

Browse source
This commit is contained in:
Nora Widdecke 2022-10-27 09:41:35 +02:00
parent eebe3f0fc2
commit e656946335
No known key found for this signature in database
GPG key ID: 2D4111B31DBB99B6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/src/bin/opgpcard/commands/admin.rs
View file

@ -61,8 +61,8 @@ pub enum AdminSubCommand {
#[clap(name = "Decryption key fingerprint", short = 'd', long = "dec-fp")] #[clap(name = "Decryption key fingerprint", short = 'd', long = "dec-fp")]
dec_fp: Option<String>, dec_fp: Option<String>,
#[clap(name = "Authentication key fingerprint", short = 'a', long = "auth-fp")] #[clap(name = "Authentication key fingerprint", short = 'a', long = "aut-fp")]
auth_fp: Option<String>, aut_fp: Option<String>,
}, },
/// Generate a Key. /// Generate a Key.
@ -200,9 +200,9 @@ pub fn admin(
keyfile, keyfile,
sig_fp, sig_fp,
dec_fp, dec_fp,
auth_fp, aut_fp,
} => { } => {
import_command(keyfile, sig_fp, dec_fp, auth_fp, card, admin_pin.as_deref())?; import_command(keyfile, sig_fp, dec_fp, aut_fp, card, admin_pin.as_deref())?;
} }
AdminSubCommand::Generate(cmd) => { AdminSubCommand::Generate(cmd) => {
generate_command( generate_command(
@ -238,14 +238,14 @@ fn keys_pick_explicit<'a>(
policy: &'a dyn Policy, policy: &'a dyn Policy,
sig_fp: Option<String>, sig_fp: Option<String>,
dec_fp: Option<String>, dec_fp: Option<String>,
auth_fp: Option<String>, aut_fp: Option<String>,
) -> Result<[Option<ValidErasedKeyAmalgamation<'a, SecretParts>>; 3]> { ) -> Result<[Option<ValidErasedKeyAmalgamation<'a, SecretParts>>; 3]> {
let key_by_fp = |fp: Option<String>| match fp { let key_by_fp = |fp: Option<String>| match fp {
Some(fp) => sq_util::private_subkey_by_fingerprint(key, policy, &fp), Some(fp) => sq_util::private_subkey_by_fingerprint(key, policy, &fp),
None => Ok(None), None => Ok(None),
}; };
Ok([key_by_fp(sig_fp)?, key_by_fp(dec_fp)?, key_by_fp(auth_fp)?]) Ok([key_by_fp(sig_fp)?, key_by_fp(dec_fp)?, key_by_fp(aut_fp)?])
} }
fn gen_subkeys( fn gen_subkeys(
@ -321,7 +321,7 @@ fn import_command(
keyfile: PathBuf, keyfile: PathBuf,
sig_fp: Option<String>, sig_fp: Option<String>,
dec_fp: Option<String>, dec_fp: Option<String>,
auth_fp: Option<String>, aut_fp: Option<String>,
mut card: Card<Transaction>, mut card: Card<Transaction>,
admin_pin: Option<&[u8]>, admin_pin: Option<&[u8]>,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
@ -330,12 +330,12 @@ fn import_command(
let p = StandardPolicy::new(); let p = StandardPolicy::new();
// select the (sub)keys to upload // select the (sub)keys to upload
let [sig, dec, auth] = match (&sig_fp, &dec_fp, &auth_fp) { let [sig, dec, auth] = match (&sig_fp, &dec_fp, &aut_fp) {
// No fingerprint has been provided, try to autoselect keys // No fingerprint has been provided, try to autoselect keys
// (this fails if there is more than one (sub)key for any keytype). // (this fails if there is more than one (sub)key for any keytype).
(&None, &None, &None) => keys_pick_yolo(&key, &p)?, (&None, &None, &None) => keys_pick_yolo(&key, &p)?,
_ => keys_pick_explicit(&key, &p, sig_fp, dec_fp, auth_fp)?, _ => keys_pick_explicit(&key, &p, sig_fp, dec_fp, aut_fp)?,
}; };
let mut pws: Vec<String> = vec![]; let mut pws: Vec<String> = vec![];