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

feat: v1.5.8, opt piv-meta

Browse Source
This commit is contained in:
Hatter Jiang
2023-05-17 00:53:17 +08:00
parent 0ad8c12c38
commit 9fb0da7d33
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -342,7 +342,7 @@ dependencies = [
[[package]] [[package]]
name = "card-cli" name = "card-cli"
version = "1.5.7" version = "1.5.8"
dependencies = [ dependencies = [
"authenticator", "authenticator",
"base64 0.13.1", "base64 0.13.1",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "card-cli" name = "card-cli"
version = "1.5.7" version = "1.5.8"
authors = ["Hatter Jiang <jht5945@gmail.com>"] authors = ["Hatter Jiang <jht5945@gmail.com>"]
edition = "2018" edition = "2018"

3
src/cmd_pivmeta.rs
View File

@@ -12,6 +12,7 @@ use yubikey::certificate::PublicKeyInfo;
use yubikey::piv::{AlgorithmId, ManagementAlgorithmId, metadata, Origin}; use yubikey::piv::{AlgorithmId, ManagementAlgorithmId, metadata, Origin};
use crate::pivutil; use crate::pivutil;
use crate::pivutil::slot_equals;
use crate::pkiutil::bytes_to_pem; use crate::pkiutil::bytes_to_pem;
pub struct CommandImpl; pub struct CommandImpl;
@@ -116,7 +117,7 @@ impl Command for CommandImpl {
Err(e) => warning!("List keys failed: {}", e), Err(e) => warning!("List keys failed: {}", e),
Ok(keys) => for k in &keys { Ok(keys) => for k in &keys {
let slot_str = format!("{:x}", Into::<u8>::into(k.slot())); let slot_str = format!("{:x}", Into::<u8>::into(k.slot()));
if slot_str == slot { if slot_equals(&slot_id, &slot_str) {
if !json.contains_key("pk_point_hex") { if !json.contains_key("pk_point_hex") {
let public_key_hex = &k.certificate().subject_pki().public_key(); let public_key_hex = &k.certificate().subject_pki().public_key();
json.insert("pk_point_hex", hex::encode(&public_key_hex)); json.insert("pk_point_hex", hex::encode(&public_key_hex));

4
src/pivutil.rs
View File

@@ -4,6 +4,10 @@ use rust_util::XResult;
use yubikey::piv::RetiredSlotId; use yubikey::piv::RetiredSlotId;
use yubikey::piv::SlotId; use yubikey::piv::SlotId;
pub fn slot_equals(slot_id: &SlotId, slot: &str) -> bool {
get_slot_id(slot).map(|sid| &sid == slot_id).unwrap_or(false)
}
pub fn get_slot_id(slot: &str) -> XResult<SlotId> { pub fn get_slot_id(slot: &str) -> XResult<SlotId> {
Ok(match slot { Ok(match slot {
"9a" => SlotId::Authentication, "9a" => SlotId::Authentication,