feat: v1.12.2

src/cmd_piv_verify.rs

@@ -2,14 +2,11 @@ use std::collections::BTreeMap;
 
 use clap::{App, Arg, ArgMatches, SubCommand};
 use openssl::rsa::{Padding, Rsa};
-use rust_util::XResult;
 use rust_util::util_clap::{Command, CommandError};
-use yubikey::{Key, YubiKey};
-use yubikey::piv::{AlgorithmId, SlotId};
+use yubikey::piv::AlgorithmId;
 
-use crate::{argsutil, cmdutil, ecdsautil, pivutil, util};
+use crate::{argsutil, cmdutil, ecdsautil, pivutil, util, yubikeyutil};
 use crate::ecdsautil::EcdsaAlgorithm;
-use crate::pivutil::slot_equals;
 
 pub struct CommandImpl;
 
@@ -24,6 +21,7 @@ impl Command for CommandImpl {
             .arg(Arg::with_name("input").short("i").long("input").takes_value(true).help("Input"))
             .arg(Arg::with_name("hash-hex").short("x").long("hash-hex").takes_value(true).help("Hash"))
             .arg(cmdutil::build_json_arg())
+            .arg(cmdutil::build_serial_arg())
     }
 
     fn run(&self, _arg_matches: &ArgMatches, sub_arg_matches: &ArgMatches) -> CommandError {
@@ -42,7 +40,7 @@ impl Command for CommandImpl {
 
         let slot_id = pivutil::get_slot_id(slot)?;
         json.insert("slot", pivutil::to_slot_hex(&slot_id));
-        if let Some(key) = find_key(&slot_id)? {
+        if let Some(key) = yubikeyutil::open_and_find_key(&slot_id, sub_arg_matches)? {
             let certificate = key.certificate();
             let tbs_certificate = &certificate.cert.tbs_certificate;
             if let Ok(algorithm_id) = pivutil::get_algorithm_id_by_certificate(certificate) {
@@ -104,17 +102,3 @@ impl Command for CommandImpl {
         Ok(None)
     }
 }
-
-fn find_key(slot_id: &SlotId) -> XResult<Option<Key>> {
-    let mut yk = opt_result!(YubiKey::open(), "YubiKey not found: {}");
-    match Key::list(&mut yk) {
-        Err(e) => warning!("List keys failed: {}", e),
-        Ok(keys) => for k in keys {
-            let slot_str = format!("{:x}", Into::<u8>::into(k.slot()));
-            if slot_equals(slot_id, &slot_str) {
-                return Ok(Some(k));
-            }
-        },
-    }
-    Ok(None)
-}