hatter/tiny-encrypt-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: update argument output-type to output-format

Browse Source
This commit is contained in:
Hatter Jiang
2024-11-17 10:38:06 +08:00
parent b9e7b5af63
commit 90372941be
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd_simple_encrypt_decrypt.rs
View File

@@ -63,9 +63,9 @@ pub struct CmdSimpleDecrypt {
#[arg(long, short = 'v')] #[arg(long, short = 'v')]
pub value: Option<String>, pub value: Option<String>,
/// Decrypt result output type (plain, hex, bse64) /// Decrypt result output format (plain, hex, bse64)
#[arg(long, short = 'o')] #[arg(long, short = 'o')]
pub output_type: Option<String>, pub output_format: Option<String>,
} }
impl CmdSimpleEncrypt { impl CmdSimpleEncrypt {
@@ -180,10 +180,10 @@ pub fn inner_simple_decrypt(cmd_simple_decrypt: CmdSimpleDecrypt) -> XResult<()>
let pin = cmd_simple_decrypt.pin.clone().or_else(util_env::get_pin); let pin = cmd_simple_decrypt.pin.clone().or_else(util_env::get_pin);
let slot = cmd_simple_decrypt.slot.clone(); let slot = cmd_simple_decrypt.slot.clone();
let output_type = cmd_simple_decrypt.output_type.as_deref().unwrap_or("plain"); let output_format = cmd_simple_decrypt.output_format.as_deref().unwrap_or("plain");
match output_type { match output_format {
"plain" | "hex" | "base64" => (), "plain" | "hex" | "base64" => (),
_ => return simple_error!("not supported output type: {}", output_type), _ => return simple_error!("not supported output format: {}", output_format),
}; };
let value = match cmd_simple_decrypt.get_value()? { let value = match cmd_simple_decrypt.get_value()? {
@@ -216,11 +216,11 @@ pub fn inner_simple_decrypt(cmd_simple_decrypt: CmdSimpleDecrypt) -> XResult<()>
return simple_error!("too many envelops: {:?}, len: {}", cmd_simple_decrypt.key_id, filter_envelops.len()); 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 = try_decrypt_key(&config, filter_envelops[0], &pin, &slot, false)?;
let value = match output_type { let value = match output_format {
"plain" => opt_result!(String::from_utf8(value), "bad value encoding: {}"), "plain" => opt_result!(String::from_utf8(value), "bad value encoding: {}"),
"hex" => hex::encode(&value), "hex" => hex::encode(&value),
"base64" => STANDARD.encode(&value), "base64" => STANDARD.encode(&value),
_ => return simple_error!("not supported output type: {}", output_type), _ => return simple_error!("not supported output format: {}", output_format),
}; };
CmdResult::success(&value).print_exit(); CmdResult::success(&value).print_exit();
} }