From 528889bcc70a272759c68b13b0ba7cc195c2e731 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 15 Dec 2024 16:34:07 +0800 Subject: [PATCH] feat: v1.8.2, fix compile issue --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/cmd_simple_encrypt_decrypt.rs | 5 +++-- src/lib.rs | 1 + src/main.rs | 2 ++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 697e256..59a933d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1871,7 +1871,7 @@ dependencies = [ [[package]] name = "tiny-encrypt" -version = "1.8.1" +version = "1.8.2" dependencies = [ "aes-gcm-stream", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index 250130a..bb2febb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tiny-encrypt" -version = "1.8.1" +version = "1.8.2" edition = "2021" license = "MIT" description = "A simple and tiny file encrypt tool" diff --git a/src/cmd_simple_encrypt_decrypt.rs b/src/cmd_simple_encrypt_decrypt.rs index 2c4d3b3..14bad58 100644 --- a/src/cmd_simple_encrypt_decrypt.rs +++ b/src/cmd_simple_encrypt_decrypt.rs @@ -1,4 +1,3 @@ -use crate::cmd_decrypt::try_decrypt_key; use crate::config::TinyEncryptConfig; use crate::consts::TINY_ENC_CONFIG_FILE; use crate::spec::TinyEncryptEnvelop; @@ -155,6 +154,7 @@ pub fn simple_encrypt(cmd_simple_encrypt: CmdSimpleEncrypt) -> XResult<()> { Ok(()) } +#[cfg(feature = "decrypt")] pub fn simple_decrypt(cmd_simple_decrypt: CmdSimpleDecrypt) -> XResult<()> { let direct_output = cmd_simple_decrypt.direct_output; if let Err(inner_result_error) = inner_simple_decrypt(cmd_simple_decrypt) { @@ -195,6 +195,7 @@ pub fn inner_simple_encrypt(cmd_simple_encrypt: CmdSimpleEncrypt) -> XResult<()> CmdResult::success(&simple_encrypt_result).print_exit(cmd_simple_encrypt.direct_output); } +#[cfg(feature = "decrypt")] pub fn inner_simple_decrypt(cmd_simple_decrypt: CmdSimpleDecrypt) -> XResult<()> { let config = TinyEncryptConfig::load(TINY_ENC_CONFIG_FILE).ok(); @@ -236,7 +237,7 @@ pub fn inner_simple_decrypt(cmd_simple_decrypt: CmdSimpleDecrypt) -> XResult<()> if filter_envelops.len() > 1 { return simple_error!("too many envelops: {:?}, len: {}", cmd_simple_decrypt.key_id, filter_envelops.len()); } - let value = try_decrypt_key(&config, filter_envelops[0], &pin, &slot, false)?; + let value = crate::cmd_decrypt::try_decrypt_key(&config, filter_envelops[0], &pin, &slot, false)?; if cmd_simple_decrypt.direct_output && output_format == "plain" { io::stdout().write_all(&value).expect("unable to write to stdout"); exit(0); diff --git a/src/lib.rs b/src/lib.rs index 12789f1..6b64e5a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,6 +15,7 @@ pub use cmd_encrypt::encrypt; pub use cmd_encrypt::encrypt_single; pub use cmd_encrypt::encrypt_single_file_out; pub use cmd_simple_encrypt_decrypt::simple_encrypt; +#[cfg(feature = "decrypt")] pub use cmd_simple_encrypt_decrypt::simple_decrypt; #[cfg(feature = "decrypt")] pub use cmd_execenv::CmdExecEnv; diff --git a/src/main.rs b/src/main.rs index 31fee19..313782f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,6 +29,7 @@ enum Commands { /// Simple encrypt message #[command(arg_required_else_help = true)] SimpleEncrypt(CmdSimpleEncrypt), + #[cfg(feature = "decrypt")] /// Simple decrypt message #[command(arg_required_else_help = true)] SimpleDecrypt(CmdSimpleDecrypt), @@ -67,6 +68,7 @@ fn main() -> XResult<()> { match args.command { Commands::Encrypt(cmd_encrypt) => tiny_encrypt::encrypt(cmd_encrypt), Commands::SimpleEncrypt(cmd_simple_encrypt) => tiny_encrypt::simple_encrypt(cmd_simple_encrypt), + #[cfg(feature = "decrypt")] Commands::SimpleDecrypt(cmd_simple_decrypt) => tiny_encrypt::simple_decrypt(cmd_simple_decrypt), #[cfg(feature = "decrypt")] Commands::Decrypt(cmd_decrypt) => tiny_encrypt::decrypt(cmd_decrypt),