aboutsummaryrefslogtreecommitdiff
path: root/nitrocli/src/commands.rs
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2019-06-08 11:37:04 -0700
committerDaniel Mueller <deso@posteo.net>2019-06-08 11:37:04 -0700
commit74be24daf592f3408524081c3760ca153294d643 (patch)
treea30dc8007f1a3772fc9092205ee0c648574c73a3 /nitrocli/src/commands.rs
parentaf14d982cfcf0cee9d364458cd9495bb981c4c98 (diff)
downloadnitrocli-74be24daf592f3408524081c3760ca153294d643.tar.gz
nitrocli-74be24daf592f3408524081c3760ca153294d643.tar.bz2
Reword an incorrect error message
This change rewords the error message that is emitted if the lock command fails. The old message was incorrectly stating a problem with the retrieval of the device's status. While at it, also slightly rephrase the description for the hidden command to be more in line with that of the other storage commands, and replace lowercase 'nitrokey' with a capitalized one in a few comments.
Diffstat (limited to 'nitrocli/src/commands.rs')
-rw-r--r--nitrocli/src/commands.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/nitrocli/src/commands.rs b/nitrocli/src/commands.rs
index 0d30bca..3cad8f1 100644
--- a/nitrocli/src/commands.rs
+++ b/nitrocli/src/commands.rs
@@ -361,7 +361,7 @@ pub fn reset(ctx: &mut args::ExecCtx<'_>) -> Result<()> {
})
}
-/// Open the encrypted volume on the nitrokey.
+/// Open the encrypted volume on the Nitrokey.
pub fn encrypted_open(ctx: &mut args::ExecCtx<'_>) -> Result<()> {
let device = get_storage_device(ctx)?;
let pin_entry = pinentry::PinEntry::from(pinentry::PinType::User, &device)?;
@@ -378,7 +378,7 @@ pub fn encrypted_open(ctx: &mut args::ExecCtx<'_>) -> Result<()> {
/// Close the previously opened encrypted volume.
pub fn encrypted_close(ctx: &mut args::ExecCtx<'_>) -> Result<()> {
// Flush all filesystem caches to disk. We are mostly interested in
- // making sure that the encrypted volume on the nitrokey we are
+ // making sure that the encrypted volume on the Nitrokey we are
// about to close is not closed while not all data was written to
// it.
unsafe { sync() };
@@ -493,7 +493,7 @@ pub fn config_set(
pub fn lock(ctx: &mut args::ExecCtx<'_>) -> Result<()> {
get_device(ctx)?
.lock()
- .map_err(|err| get_error("Getting Storage status failed", err))
+ .map_err(|err| get_error("Could not lock the device", err))
}
fn get_otp<T: GenerateOtp>(slot: u8, algorithm: args::OtpAlgorithm, device: &T) -> Result<String> {