feat: v1.5.7, update piv

This commit is contained in:
2023-05-14 23:26:13 +08:00
parent 0af2940cd0
commit 0ad8c12c38
8 changed files with 88 additions and 32 deletions

39
src/pivutil.rs Normal file
View File

@@ -0,0 +1,39 @@
use std::str::FromStr;
use rust_util::XResult;
use yubikey::piv::RetiredSlotId;
use yubikey::piv::SlotId;
pub fn get_slot_id(slot: &str) -> XResult<SlotId> {
Ok(match slot {
"9a" => SlotId::Authentication,
"9c" => SlotId::Signature,
"9d" => SlotId::KeyManagement,
"9e" => SlotId::CardAuthentication,
"r1" | "R1" => SlotId::Retired(RetiredSlotId::R1),
"r2" | "R2" => SlotId::Retired(RetiredSlotId::R2),
"r3" | "R3" => SlotId::Retired(RetiredSlotId::R3),
"r4" | "R4" => SlotId::Retired(RetiredSlotId::R4),
"r5" | "R5" => SlotId::Retired(RetiredSlotId::R5),
"r6" | "R6" => SlotId::Retired(RetiredSlotId::R6),
"r7" | "R7" => SlotId::Retired(RetiredSlotId::R7),
"r8" | "R8" => SlotId::Retired(RetiredSlotId::R8),
"r9" | "R9" => SlotId::Retired(RetiredSlotId::R9),
"r10" | "R10" => SlotId::Retired(RetiredSlotId::R10),
"r11" | "R11" => SlotId::Retired(RetiredSlotId::R11),
"r12" | "R12" => SlotId::Retired(RetiredSlotId::R12),
"r13" | "R13" => SlotId::Retired(RetiredSlotId::R13),
"r14" | "R14" => SlotId::Retired(RetiredSlotId::R14),
"r15" | "R15" => SlotId::Retired(RetiredSlotId::R15),
"r16" | "R16" => SlotId::Retired(RetiredSlotId::R16),
"r17" | "R17" => SlotId::Retired(RetiredSlotId::R17),
"r18" | "R18" => SlotId::Retired(RetiredSlotId::R18),
"r19" | "R19" => SlotId::Retired(RetiredSlotId::R19),
"r20" | "R20" => SlotId::Retired(RetiredSlotId::R20),
_ => {
let retired_slot_id = opt_result!(RetiredSlotId::from_str(slot), "Slot not found: {}");
debugging!("Retried slot id: {}", retired_slot_id);
SlotId::Retired(retired_slot_id)
}
})
}