From a60bf5c74ac712105500cb6ad3ee8d3fd5e6ce63 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Fri, 8 Dec 2023 23:23:53 +0800 Subject: [PATCH] feat: pending support key-256 (secure enclave) --- Cargo.toml | 2 +- src/cmd_version.rs | 16 +++++++++------- src/util_keychainkey.rs | 3 +++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 932404c..2a14a0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://git.hatter.ink/hatter/tiny-encrypt-rs" default = ["decrypt", "macos", "secure-enclave"] decrypt = ["openpgp-card", "openpgp-card-pcsc", "yubikey"] macos = ["security-framework"] -secure-enclave = [] +secure-enclave = ["macos"] [dependencies] aes-gcm-stream = "0.2" diff --git a/src/cmd_version.rs b/src/cmd_version.rs index 6d23f78..5644966 100644 --- a/src/cmd_version.rs +++ b/src/cmd_version.rs @@ -1,22 +1,24 @@ use clap::Args; -use rust_util::XResult; +use rust_util::{iff, XResult}; use crate::util; +#[cfg(feature = "secure-enclave")] +use crate::util_keychainkey; #[derive(Debug, Args)] pub struct CmdVersion {} pub fn version(_cmd_version: CmdVersion) -> XResult<()> { - let mut features: Vec<&str> = vec![]; + let mut features: Vec = vec![]; #[cfg(feature = "decrypt")] - features.push("decrypt"); + features.push("decrypt".to_string()); #[cfg(feature = "macos")] - features.push("macos"); + features.push("macos".to_string()); #[cfg(feature = "secure-enclave")] - features.push("secure-enclave"); - if features.is_empty() { features.push("-"); } + features.push(format!("secure-enclave{}", iff!(util_keychainkey::is_support_secure_enclave(), "*", ""))); + if features.is_empty() { features.push("-".to_string()); } println!( - "User-Agent: {} [ with features: {} ]\n{}", + "User-Agent: {} [with features: {}]\n{}", util::get_user_agent(), features.join(", "), env!("CARGO_PKG_DESCRIPTION") diff --git a/src/util_keychainkey.rs b/src/util_keychainkey.rs index e69de29..fd6ec67 100644 --- a/src/util_keychainkey.rs +++ b/src/util_keychainkey.rs @@ -0,0 +1,3 @@ +pub fn is_support_secure_enclave() -> bool { + false +}