diff --git a/Cargo.lock b/Cargo.lock index 734111f..baa48b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,7 +508,7 @@ dependencies = [ [[package]] name = "card-cli" -version = "1.13.7" +version = "1.13.8" dependencies = [ "aes-gcm-stream", "authenticator 0.3.1", diff --git a/Cargo.toml b/Cargo.toml index b310552..1522c38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "card-cli" -version = "1.13.7" +version = "1.13.8" authors = ["Hatter Jiang "] edition = "2018" diff --git a/src/cmd_keypair_generate.rs b/src/cmd_keypair_generate.rs index 7e14d0d..e60d3bf 100644 --- a/src/cmd_keypair_generate.rs +++ b/src/cmd_keypair_generate.rs @@ -99,9 +99,12 @@ impl Command for CommandImpl { || pbeutil::is_simple_pbe_encrypted(&pkcs8_base64); let yubikey_hmac_enc_soft_key_uri = 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 { - key_name: format!("yubikey{}-{}", yk.version().major, yk.serial().0), + key_name: yubikey_name, algorithm: algorithm_id, hmac_enc_private_key: pkcs8_base64.clone(), };