From 80ce9fcecec1b5861a6492c93f834eb22eb11093 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sun, 14 Jan 2024 22:03:26 +0800
Subject: [PATCH] v1.7.8, update config display

---
 Cargo.lock        | 2 +-
 Cargo.toml        | 2 +-
 src/cmd_config.rs | 6 +++++-
 src/spec.rs       | 9 +++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b2454de..9306cfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1847,7 +1847,7 @@ dependencies = [
 
 [[package]]
 name = "tiny-encrypt"
-version = "1.7.7"
+version = "1.7.8"
 dependencies = [
  "aes-gcm-stream",
  "base64",
diff --git a/Cargo.toml b/Cargo.toml
index 9fea6ba..41cd642 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tiny-encrypt"
-version = "1.7.7"
+version = "1.7.8"
 edition = "2021"
 license = "MIT"
 description = "A simple and tiny file encrypt tool"
diff --git a/src/cmd_config.rs b/src/cmd_config.rs
index b52fcac..ed83cf2 100644
--- a/src/cmd_config.rs
+++ b/src/cmd_config.rs
@@ -71,8 +71,12 @@ fn config_key_filter(cmd_version: &CmdConfig, config: &TinyEncryptConfig) -> XRe
     information!("Found {} envelops", envelops.len());
     let mut config_envelops = vec![];
     for envelop in envelops {
+        let hardware_security_mark = match envelop.r#type.is_hardware_security() {
+            None => " ?",
+            Some(hardware_security) => iff!(hardware_security, " *", "")
+        };
         config_envelops.push(ConfigEnvelop {
-            r#type: format!("{}{}", envelop.r#type.get_name(), iff!(envelop.r#type.is_hardware_security(), " *", "")),
+            r#type: format!("{}{}", envelop.r#type.get_name(), hardware_security_mark),
             sid: strip_field(&envelop.sid.as_ref().map(ToString::to_string).unwrap_or_else(|| "-".to_string()), 25),
             kid: strip_field(&envelop.kid, 40),
             desc: strip_field(&envelop.desc.as_ref().map(ToString::to_string).unwrap_or_else(|| "-".to_string()), 40),
diff --git a/src/spec.rs b/src/spec.rs
index bb9d045..a2a1db4 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -140,7 +140,7 @@ impl TinyEncryptEnvelopType {
         }
     }
 
-    pub fn is_hardware_security(&self) -> bool {
+    pub fn is_hardware_security(&self) -> Option<bool> {
         match self {
             TinyEncryptEnvelopType::PgpRsa
             | TinyEncryptEnvelopType::PgpX25519
@@ -148,11 +148,12 @@ impl TinyEncryptEnvelopType {
             | TinyEncryptEnvelopType::PivP256
             | TinyEncryptEnvelopType::PivP384
             | TinyEncryptEnvelopType::PivRsa
-            | TinyEncryptEnvelopType::Age => true,
+            | TinyEncryptEnvelopType::Age => Some(true),
             TinyEncryptEnvelopType::StaticX25519
             | TinyEncryptEnvelopType::StaticKyber1024
-            | TinyEncryptEnvelopType::Gpg // GPG is unknown(hardware/software)
-            | TinyEncryptEnvelopType::Kms => false,
+            | TinyEncryptEnvelopType::Kms => Some(false),
+            // GPG is unknown(hardware/software)
+            TinyEncryptEnvelopType::Gpg => None,
         }
     }
 }