aboutsummaryrefslogtreecommitdiff
path: root/src/auth.rs
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2019-01-17 04:15:31 +0000
committerRobin Krahl <robin.krahl@ireas.org>2019-01-20 21:08:26 +0000
commit944e1fa0d51e547dde2a9368d2b8431b109f63c4 (patch)
tree0a8b2d5bb9a00149cefb6eecaaf8ac556e961690 /src/auth.rs
parentcafc3a6f8cfb9f82343c1d3fe843c7f8d7ef1136 (diff)
downloadnitrokey-rs-944e1fa0d51e547dde2a9368d2b8431b109f63c4.tar.gz
nitrokey-rs-944e1fa0d51e547dde2a9368d2b8431b109f63c4.tar.bz2
Move the CommandError::Unknown to Error
An error code can not only indiciate a command error, but also a library or device communication error. Therefore, the variant for an unknown error code should be placed in the top-level Error enum instead of the CommandError enum.
Diffstat (limited to 'src/auth.rs')
-rw-r--r--src/auth.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/auth.rs b/src/auth.rs
index 509d3aa..e05f6b3 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -6,7 +6,7 @@ use nitrokey_sys;
use crate::config::{Config, RawConfig};
use crate::device::{Device, DeviceWrapper, Pro, Storage};
-use crate::error::{CommandError, Error};
+use crate::error::Error;
use crate::otp::{ConfigureOtp, GenerateOtp, OtpMode, OtpSlotData, RawOtpSlotData};
use crate::util::{generate_password, get_command_result, get_cstring, result_from_string};
@@ -161,7 +161,7 @@ where
let temp_password_ptr = temp_password.as_ptr() as *const c_char;
return match callback(password_ptr, temp_password_ptr) {
0 => Ok(A::new(device, temp_password)),
- rv => Err((device, CommandError::from(rv).into())),
+ rv => Err((device, Error::from(rv))),
};
}