diff --git a/src/main.rs b/src/main.rs index 118e92e..03e28d5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,6 +39,7 @@ struct Cli { raw_key: Option>, /// Read passphrase interactively (terminal). Implies argon2id KDF on encrypt. + /// This is the default when no key source is specified. #[clap(short, long)] passphrase: bool, @@ -131,8 +132,13 @@ fn run(mut cli: Cli) -> Result<(), FcryError> { let raw_key_str: Option> = cli.raw_key.take(); let pw_src: Option = if cli.passphrase { Some(PassphraseSource::Tty) + } else if let Some(var) = cli.passphrase_env.take() { + Some(PassphraseSource::EnvVar(var)) + } else if raw_key_str.is_none() { + // Default to interactive TTY passphrase when no key source is given. + Some(PassphraseSource::Tty) } else { - cli.passphrase_env.take().map(PassphraseSource::EnvVar) + None }; let decrypt_mode = cli.decrypt; @@ -144,12 +150,6 @@ fn run(mut cli: Cli) -> Result<(), FcryError> { let argon_parallelism = cli.argon_parallelism; drop(cli); - if pw_src.is_none() && raw_key_str.is_none() { - return Err(FcryError::Format( - "must provide one of --raw-key, --passphrase, --passphrase-env".into(), - )); - } - if decrypt_mode { let raw_key = match raw_key_str.as_deref() { Some(s) => Some(parse_raw_key(s)?),