hatter/card-cli
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: optimize code

Browse Source
This commit is contained in:
Hatter Jiang
2023-11-20 22:40:18 +08:00
parent e9afbe528e
commit 8d163a5ec2
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cmd_chall.rs
View File

@@ -31,24 +31,26 @@ impl Command for CommandImpl {
let challenge_bytes = hmacutil::get_challenge_bytes(sub_arg_matches)?; let challenge_bytes = hmacutil::get_challenge_bytes(sub_arg_matches)?;
let mut yubi = Yubico::new(); let mut yubi = Yubico::new();
if let Ok(device) = yubi.find_yubikey() { let device = match yubi.find_yubikey() {
success!("Found key, Vendor ID: {:?}, Product ID: {:?}", device.vendor_id, device.product_id); Ok(device) => device,
Err(_) => {
warning!("YubiKey not found");
return Ok(Some(1));
}
};
let config = Config::default() success!("Found key, Vendor ID: {:?}, Product ID: {:?}", device.vendor_id, device.product_id);
.set_vendor_id(device.vendor_id) let config = Config::default()
.set_product_id(device.product_id) .set_vendor_id(device.vendor_id)
.set_variable_size(true) .set_product_id(device.product_id)
.set_mode(Mode::Sha1) .set_variable_size(true)
.set_slot(Slot::Slot2); .set_mode(Mode::Sha1)
.set_slot(Slot::Slot2);
// In HMAC Mode, the result will always be the SAME for the SAME provided challenge // In HMAC Mode, the result will always be the SAME for the SAME provided challenge
let hmac_result = opt_result!(yubi.challenge_response_hmac(&challenge_bytes, config), "Challenge HMAC failed: {}"); let hmac_result = opt_result!(yubi.challenge_response_hmac(&challenge_bytes, config), "Challenge HMAC failed: {}");
hmacutil::output_hmac_result(sub_arg_matches, json_output, challenge_bytes, hmac_result.deref()); hmacutil::output_hmac_result(sub_arg_matches, json_output, challenge_bytes, hmac_result.deref());
} else {
warning!("YubiKey not found");
return Ok(Some(1));
}
Ok(None) Ok(None)
} }