From 638e40448a93a78486f4bbf0726d6b0e039ccf9a Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Fri, 8 Dec 2023 22:58:54 +0800 Subject: [PATCH] feat: v1.1.2, support readonly for secure editor --- src/cmd_decrypt.rs | 4 ++-- src/cmd_initkeychainkey.rs | 4 ++-- src/lib.rs | 2 +- src/{util_keychainpasskey.rs => util_keychainstatic.rs} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename src/{util_keychainpasskey.rs => util_keychainstatic.rs} (100%) diff --git a/src/cmd_decrypt.rs b/src/cmd_decrypt.rs index 78df5d8..1dbcf1d 100644 --- a/src/cmd_decrypt.rs +++ b/src/cmd_decrypt.rs @@ -31,7 +31,7 @@ use crate::spec::{EncEncryptedMeta, TinyEncryptEnvelop, TinyEncryptEnvelopType, use crate::util::SecVec; use crate::util_digest::DigestWrite; #[cfg(feature = "macos")] -use crate::util_keychainpasskey; +use crate::util_keychainstatic; use crate::util_progress::Progress; use crate::wrap_key::WrapKey; @@ -523,7 +523,7 @@ fn try_decrypt_key_ecdh_static_x25519(config: &Option, envelo let service_name = &config_envelop_args[1]; let key_name = &config_envelop_args[2]; let shared_secret = opt_result!( - util_keychainpasskey::decrypt_data(service_name, key_name, &e_pub_key_bytes), "Decrypt static x25519 failed: {}"); + util_keychainstatic::decrypt_data(service_name, key_name, &e_pub_key_bytes), "Decrypt static x25519 failed: {}"); let key = util::simple_kdf(shared_secret.as_slice()); let key_nonce = KeyNonce { k: &key, n: &wrap_key.nonce }; diff --git a/src/cmd_initkeychainkey.rs b/src/cmd_initkeychainkey.rs index 2a89011..bdd5e98 100644 --- a/src/cmd_initkeychainkey.rs +++ b/src/cmd_initkeychainkey.rs @@ -4,7 +4,7 @@ use security_framework::os::macos::keychain::SecKeychain; use crate::config::TinyEncryptConfigEnvelop; use crate::spec::TinyEncryptEnvelopType; -use crate::util_keychainpasskey; +use crate::util_keychainstatic; #[derive(Debug, Args)] pub struct CmdKeychainKey { @@ -29,7 +29,7 @@ pub fn keychain_key(cmd_keychain_key: CmdKeychainKey) -> XResult<()> { return simple_error!("Static x25519 exists: {}.{}", service_name, &cmd_keychain_key.key_name); } - let (keychain_key, public_key) = util_keychainpasskey::generate_pass_x25519_static_secret(); + let (keychain_key, public_key) = util_keychainstatic::generate_pass_x25519_static_secret(); opt_result!( sec_keychain.set_generic_password(service_name, &cmd_keychain_key.key_name, keychain_key.as_bytes()), "Write static x25519 failed: {}" diff --git a/src/lib.rs b/src/lib.rs index 77a1832..36e2636 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -59,7 +59,7 @@ mod cmd_directdecrypt; #[cfg(feature = "macos")] mod cmd_initkeychainkey; #[cfg(feature = "macos")] -mod util_keychainpasskey; +mod util_keychainstatic; #[cfg(feature = "decrypt")] mod cmd_execenv; diff --git a/src/util_keychainpasskey.rs b/src/util_keychainstatic.rs similarity index 100% rename from src/util_keychainpasskey.rs rename to src/util_keychainstatic.rs