feat: 1.13.8
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -508,7 +508,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "card-cli"
|
name = "card-cli"
|
||||||
version = "1.13.7"
|
version = "1.13.8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm-stream",
|
"aes-gcm-stream",
|
||||||
"authenticator 0.3.1",
|
"authenticator 0.3.1",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "card-cli"
|
name = "card-cli"
|
||||||
version = "1.13.7"
|
version = "1.13.8"
|
||||||
authors = ["Hatter Jiang <jht5945@gmail.com>"]
|
authors = ["Hatter Jiang <jht5945@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
|||||||
@@ -99,9 +99,12 @@ impl Command for CommandImpl {
|
|||||||
|| pbeutil::is_simple_pbe_encrypted(&pkcs8_base64);
|
|| pbeutil::is_simple_pbe_encrypted(&pkcs8_base64);
|
||||||
let yubikey_hmac_enc_soft_key_uri =
|
let yubikey_hmac_enc_soft_key_uri =
|
||||||
if let (true, Some(algorithm_id)) = (with_encrypt, algorithm_id) {
|
if let (true, Some(algorithm_id)) = (with_encrypt, algorithm_id) {
|
||||||
let yk = yubikeyutil::open_yubikey()?;
|
let yubikey_name = match yubikeyutil::open_yubikey() {
|
||||||
|
Ok(yk) => format!("yubikey{}-{}", yk.version().major, yk.serial().0),
|
||||||
|
Err(_) => "yubikey-unknown".to_string(),
|
||||||
|
};
|
||||||
let yubikey_hmac_enc_soft_key = YubikeyHmacEncSoftKey {
|
let yubikey_hmac_enc_soft_key = YubikeyHmacEncSoftKey {
|
||||||
key_name: format!("yubikey{}-{}", yk.version().major, yk.serial().0),
|
key_name: yubikey_name,
|
||||||
algorithm: algorithm_id,
|
algorithm: algorithm_id,
|
||||||
hmac_enc_private_key: pkcs8_base64.clone(),
|
hmac_enc_private_key: pkcs8_base64.clone(),
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user