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

opgpcard: Clean up returns

Browse source
This commit is contained in:
Nora Widdecke 2022-10-26 14:06:40 +02:00
parent 1ecaf396c7
commit 56d70e3218
No known key found for this signature in database
GPG key ID: 2D4111B31DBB99B6
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tools/src/bin/opgpcard/commands/pin.rs
View file

@ -77,37 +77,35 @@ pub fn pin(ident: &str, cmd: PinSubCommand) -> Result<()> {
let pinpad_modify = open.feature_pinpad_modify(); let pinpad_modify = open.feature_pinpad_modify();
// TODO de-complicate return, remove question marks
match cmd { match cmd {
PinSubCommand::SetUser { PinSubCommand::SetUser {
user_pin_old, user_pin_old,
user_pin_new, user_pin_new,
} => set_user(user_pin_old, user_pin_new, pinpad_modify, open)?, } => set_user(user_pin_old, user_pin_new, pinpad_modify, open),
PinSubCommand::SetAdmin { PinSubCommand::SetAdmin {
admin_pin_old, admin_pin_old,
admin_pin_new, admin_pin_new,
} => set_admin(admin_pin_old, admin_pin_new, pinpad_modify, open)?, } => set_admin(admin_pin_old, admin_pin_new, pinpad_modify, open),
// TODO: this doesn't use pinpad_modify, maybe don't compute it before this? // TODO: this doesn't use pinpad_modify, maybe don't compute it before this?
PinSubCommand::ResetUser { PinSubCommand::ResetUser {
admin_pin, admin_pin,
user_pin_new, user_pin_new,
} => reset_user(admin_pin, user_pin_new, open)?, } => reset_user(admin_pin, user_pin_new, open),
// TODO: this doesn't use pinpad_modify, maybe don't compute it before this? // TODO: this doesn't use pinpad_modify, maybe don't compute it before this?
PinSubCommand::SetReset { PinSubCommand::SetReset {
admin_pin, admin_pin,
reset_code, reset_code,
} => set_reset(admin_pin, reset_code, open)?, } => set_reset(admin_pin, reset_code, open),
// TODO: this doesn't use pinpad_modify, maybe don't compute it before this? // TODO: this doesn't use pinpad_modify, maybe don't compute it before this?
PinSubCommand::ResetUserRc { PinSubCommand::ResetUserRc {
reset_code, reset_code,
user_pin_new, user_pin_new,
} => reset_user_rc(reset_code, user_pin_new, open)?, } => reset_user_rc(reset_code, user_pin_new, open),
} }
Ok(())
} }
fn set_user( fn set_user(
@ -142,15 +140,13 @@ fn set_user(
}) })
}; };
if res.is_err() { match res {
Err(err) => {
println!("\nFailed to change the User PIN!"); println!("\nFailed to change the User PIN!");
println!("{:?}", res); println!("{:?}", err);
if let Err(err) = res {
print_gnuk_note(err, &open)?; print_gnuk_note(err, &open)?;
} }
} else { Ok(_) => println!("\nUser PIN has been set."),
println!("\nUser PIN has been set.");
} }
Ok(()) Ok(())
} }
@ -220,16 +216,15 @@ fn reset_user(
let res = if let Some(mut admin) = open.admin_card() { let res = if let Some(mut admin) = open.admin_card() {
admin.reset_user_pin(&pin) admin.reset_user_pin(&pin)
} else { } else {
return Err(anyhow::anyhow!("Failed to use card in admin-mode.").into()); return Err(anyhow::anyhow!("Failed to use card in admin-mode."));
}; };
if res.is_err() { match res {
Err(err) => {
println!("\nFailed to change the User PIN!"); println!("\nFailed to change the User PIN!");
if let Err(err) = res {
print_gnuk_note(err, &open)?; print_gnuk_note(err, &open)?;
} }
} else { Ok(_) => println!("\nUser PIN has been set."),
println!("\nUser PIN has been set.");
} }
Ok(()) Ok(())
} }
@ -265,7 +260,7 @@ fn set_reset(
println!("\nResetting code has been set."); println!("\nResetting code has been set.");
Ok(()) Ok(())
} else { } else {
Err(anyhow::anyhow!("Failed to use card in admin-mode.").into()) Err(anyhow::anyhow!("Failed to use card in admin-mode."))
} }
} }
@ -296,9 +291,11 @@ fn reset_user_rc(
match open.reset_user_pin(&rst, &pin) { match open.reset_user_pin(&rst, &pin) {
Err(err) => { Err(err) => {
println!("\nFailed to change the User PIN!"); println!("\nFailed to change the User PIN!");
print_gnuk_note(err, &open)?; print_gnuk_note(err, &open)
}
Ok(_) => println!("\nUser PIN has been set."),
} }
Ok(_) => {
println!("\nUser PIN has been set.");
Ok(()) Ok(())
} }
}
}