diff --git a/Cargo.lock b/Cargo.lock index c0d2cd1..1131e4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "tiny-encrypt" -version = "1.7.10" +version = "1.7.11" dependencies = [ "aes-gcm-stream", "base64", diff --git a/Cargo.toml b/Cargo.toml index a6c1168..50f2db9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tiny-encrypt" -version = "1.7.10" +version = "1.7.11" edition = "2021" license = "MIT" description = "A simple and tiny file encrypt tool" @@ -9,7 +9,8 @@ repository = "https://git.hatter.ink/hatter/tiny-encrypt-rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -default = ["decrypt", "macos", "smartcard", "secure-enclave"] +default = ["decrypt", "macos", "smartcard"] +full = ["decrypt", "macos", "smartcard", "secure-enclave"] decrypt = ["smartcard"] smartcard = ["openpgp-card", "openpgp-card-pcsc", "yubikey"] macos = ["security-framework"] diff --git a/justfile b/justfile index 36fc224..37e709e 100644 --- a/justfile +++ b/justfile @@ -3,11 +3,11 @@ _: # Install local install: - cargo install --path . + cargo install --no-default-features --features full --path . # Default build release build: - cargo build --release + cargo build --no-default-features --features full --release # Build release without features build-no-features: @@ -20,4 +20,4 @@ try-build-all: cargo build --no-default-features --features decrypt cargo build --no-default-features --features macos cargo build --no-default-features --features secure-enclave - cargo build + cargo build --no-default-features --features full diff --git a/src/cmd_version.rs b/src/cmd_version.rs index c0618dc..a7148b3 100644 --- a/src/cmd_version.rs +++ b/src/cmd_version.rs @@ -1,5 +1,5 @@ use clap::Args; -use rust_util::{iff, XResult}; +use rust_util::XResult; use crate::util; #[cfg(feature = "secure-enclave")] @@ -17,7 +17,7 @@ pub fn version(_cmd_version: CmdVersion) -> XResult<()> { #[cfg(feature = "smartcard")] features.push("smartcard".to_string()); #[cfg(feature = "secure-enclave")] - features.push(format!("secure-enclave{}", iff!(util_keychainkey::is_support_se(), "*", ""))); + features.push(format!("secure-enclave{}", rust_util::iff!(util_keychainkey::is_support_se(), "*", ""))); if features.is_empty() { features.push("-".to_string()); } println!( "User-Agent: {} [with features: {}]\n{}",