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

feat: 1.9.7, add pinentry support

Browse Source
This commit is contained in:
Hatter Jiang
2024-06-30 23:34:53 +08:00
parent 6e32dc341c
commit 14585af7c6
16 changed files with 170 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd_pivrsasign.rs
View File

@@ -6,7 +6,7 @@ use rust_util::util_msg;
use yubikey::{piv, YubiKey};
use yubikey::piv::{AlgorithmId, SlotId};
use crate::{pivutil, rsautil};
use crate::{pinutil, pivutil, rsautil};
use crate::util::base64_encode;
pub struct CommandImpl;
@@ -17,7 +17,7 @@ impl Command for CommandImpl {
fn subcommand<'a>(&self) -> App<'a, 'a> {
SubCommand::with_name(self.name()).about("PIV RSA sign(with SHA256) subcommand")
.arg(Arg::with_name("slot").short("s").long("slot").takes_value(true).help("PIV slot, e.g. 82, 83 ... 95, 9a, 9c, 9d, 9e"))
.arg(Arg::with_name("pin").short("p").long("pin").takes_value(true).default_value("123456").help("OpenPGP card user pin"))
.arg(Arg::with_name("pin").short("p").long("pin").takes_value(true).help("PIV card user PIN"))
.arg(Arg::with_name("sha256").short("2").long("sha256").takes_value(true).help("Digest SHA256 HEX"))
.arg(Arg::with_name("json").long("json").help("JSON output"))
}
@@ -27,6 +27,8 @@ impl Command for CommandImpl {
if json_output { util_msg::set_logger_std_out(false); }
let pin_opt = sub_arg_matches.value_of("pin");
let pin_opt = pinutil::get_pin(pin_opt);
let pin_opt = pin_opt.as_deref();
let pin = opt_value_result!(pin_opt, "User pin must be assigned");
let sha256_hex_opt = sub_arg_matches.value_of("sha256").map(|s| s.to_string());