diff options
| -rw-r--r-- | nitrocli/src/args.rs | 2 | ||||
| -rw-r--r-- | nitrocli/src/commands.rs | 6 | ||||
| -rw-r--r-- | nitrocli/src/pinentry.rs | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs index 07a3e6a..d4c3809 100644 --- a/nitrocli/src/args.rs +++ b/nitrocli/src/args.rs @@ -115,7 +115,7 @@ fn close(args: Vec<String>) -> Result<()> { /// Clear the PIN stored when opening the nitrokey's encrypted volume. fn clear(args: Vec<String>) -> Result<()> { let mut parser = argparse::ArgumentParser::new(); - parser.set_description("Clears the cached passphrase"); + parser.set_description("Clears the cached passphrases"); parse(&parser, args)?; commands::clear() diff --git a/nitrocli/src/commands.rs b/nitrocli/src/commands.rs index 269cafc..b3e71a1 100644 --- a/nitrocli/src/commands.rs +++ b/nitrocli/src/commands.rs @@ -23,8 +23,6 @@ use crate::error::Error; use crate::pinentry; use crate::Result; -const PIN_TYPE: pinentry::PinType = pinentry::PinType::User; - /// Create an `error::Error` with an error message of the format `msg: err`. fn get_error(msg: &str, err: &nitrokey::CommandError) -> Error { Error::Error(format!("{}: {:?}", msg, err)) @@ -198,5 +196,7 @@ pub fn close() -> Result<()> { /// Clear the PIN stored when opening the nitrokey's encrypted volume. pub fn clear() -> Result<()> { - pinentry::clear_passphrase(PIN_TYPE) + pinentry::clear_passphrase(pinentry::PinType::Admin)?; + pinentry::clear_passphrase(pinentry::PinType::User)?; + Ok(()) } diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs index ce9a98f..891de38 100644 --- a/nitrocli/src/pinentry.rs +++ b/nitrocli/src/pinentry.rs @@ -28,7 +28,6 @@ use crate::error::Error; #[derive(Clone, Copy, Debug, PartialEq)] pub enum PinType { /// The admin PIN. - #[allow(unused)] Admin, /// The user PIN. User, |