feat: v1.12.2
This commit is contained in:
@@ -9,7 +9,7 @@ use tabled::{Table, Tabled};
|
||||
use x509_parser::parse_x509_certificate;
|
||||
use yubikey::piv::{metadata, SlotId};
|
||||
use yubikey::{Certificate, YubiKey};
|
||||
use crate::{cmdutil, util};
|
||||
use crate::{cmdutil, util, yubikeyutil};
|
||||
use crate::pivutil::{get_algorithm_id_by_certificate, ToStr, ORDERED_SLOTS};
|
||||
|
||||
const NA: &str = "N/A";
|
||||
@@ -38,6 +38,7 @@ impl Command for CommandImpl {
|
||||
.arg(Arg::with_name("all").long("all").help("Show all"))
|
||||
.arg(Arg::with_name("ordered").long("ordered").help("Show ordered"))
|
||||
.arg(cmdutil::build_json_arg())
|
||||
.arg(cmdutil::build_serial_arg())
|
||||
}
|
||||
|
||||
fn run(&self, _arg_matches: &ArgMatches, sub_arg_matches: &ArgMatches) -> CommandError {
|
||||
@@ -48,7 +49,7 @@ impl Command for CommandImpl {
|
||||
let show_ordered = sub_arg_matches.is_present("ordered");
|
||||
|
||||
let mut output = Map::new();
|
||||
let mut yk = opt_result!(YubiKey::open(), "YubiKey not found: {}");
|
||||
let mut yk = yubikeyutil::open_yubikey_with_args(sub_arg_matches)?;
|
||||
|
||||
success!("Name: {}", yk.name());
|
||||
information!("Version: {}", yk.version());
|
||||
|
||||
Reference in New Issue
Block a user