Update nitrokey crate to 0.2.3

This change updates the nitrokey crate to version 0.2.3. This version
bumps the rand crate used to 0.6.1, which in turn requires an additional
set of dependencies.

Import subrepo nitrokey/:nitrokey at b3e2adc5bb1300441ca74cc7672617c042f3ea31
Import subrepo rand/:rand at 73613ff903512e9503e41cc8ba9eae76269dc598
Import subrepo rustc_version/:rustc_version at 0294f2ba2018bf7be672abd53db351ce5055fa02
Import subrepo semver-parser/:semver-parser at 750da9b11a04125231b1fb293866ca036845acee
Import subrepo semver/:semver at 5eb6db94fa03f4d5c64a625a56188f496be47598

1 files changed, 164 insertions, 0 deletions

diff --git a/nitrokey/tests/pws.rs b/nitrokey/tests/pws.rs
new file mode 100644
index 0000000..875324b
--- /dev/null
+++ b/nitrokey/tests/pws.rs
@@ -0,0 +1,164 @@
+mod util;
+
+use std::ffi::CStr;
+
+use libc::{c_int, c_void, free};
+use nitrokey::{CommandError, Device, GetPasswordSafe, PasswordSafe, SLOT_COUNT};
+use nitrokey_sys;
+
+use crate::util::{Target, ADMIN_PASSWORD, USER_PASSWORD};
+
+fn get_slot_name_direct(slot: u8) -> Result<String, CommandError> {
+    let ptr = unsafe { nitrokey_sys::NK_get_password_safe_slot_name(slot) };
+    if ptr.is_null() {
+        return Err(CommandError::Unknown);
+    }
+    let s = unsafe { CStr::from_ptr(ptr).to_string_lossy().into_owned() };
+    unsafe { free(ptr as *mut c_void) };
+    match s.is_empty() {
+        true => {
+            let error = unsafe { nitrokey_sys::NK_get_last_command_status() } as c_int;
+            match error {
+                0 => Err(CommandError::Unknown),
+                other => Err(CommandError::from(other)),
+            }
+        }
+        false => Ok(s),
+    }
+}
+
+fn get_pws(device: &Target) -> PasswordSafe {
+    device.get_password_safe(USER_PASSWORD).unwrap()
+}
+
+#[test]
+#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)]
+fn enable() {
+    let device = Target::connect().unwrap();
+    assert!(device
+        .get_password_safe(&(USER_PASSWORD.to_owned() + "123"))
+        .is_err());
+    assert!(device.get_password_safe(USER_PASSWORD).is_ok());
+    assert!(device.get_password_safe(ADMIN_PASSWORD).is_err());
+    assert!(device.get_password_safe(USER_PASSWORD).is_ok());
+}
+
+#[test]
+#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)]
+fn drop() {
+    let device = Target::connect().unwrap();
+    {
+        let pws = get_pws(&device);
+        assert!(pws.write_slot(1, "name", "login", "password").is_ok());
+        assert_eq!("name", pws.get_slot_name(1).unwrap());
+        let result = get_slot_name_direct(1);
+        assert_eq!(Ok(String::from("name")), result);
+    }
+    let result = get_slot_name_direct(1);
+    assert_eq!(Ok(String::from("name")), result);
+    assert!(device.lock().is_ok());
+    let result = get_slot_name_direct(1);
+    assert_eq!(Err(CommandError::NotAuthorized), result);
+}
+
+#[test]
+#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)]
+fn get_status() {
+    let device = Target::connect().unwrap();
+    let pws = get_pws(&device);
+    for i in 0..SLOT_COUNT {
+        assert!(pws.erase_slot(i).is_ok(), "Could not erase slot {}", i);
+    }
+    let status = pws.get_slot_status().unwrap();
+    assert_eq!(status, [false; SLOT_COUNT as usize]);
+
+    assert!(pws.write_slot(1, "name", "login", "password").is_ok());
+    let status = pws.get_slot_status().unwrap();
+    for i in 0..SLOT_COUNT {
+        assert_eq!(i == 1, status[i as usize]);
+    }
+
+    for i in 0..SLOT_COUNT {
+        assert!(pws.write_slot(i, "name", "login", "password").is_ok());
+    }
+    let status = pws.get_slot_status().unwrap();
+    assert_eq!(status, [true; SLOT_COUNT as usize]);
+}
+
+#[test]
+#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)]
+fn get_data() {
+    let device = Target::connect().unwrap();
+    let pws = get_pws(&device);
+    assert!(pws.write_slot(1, "name", "login", "password").is_ok());
+    assert_eq!("name", pws.get_slot_name(1).unwrap());
+    assert_eq!("login", pws.get_slot_login(1).unwrap());
+    assert_eq!("password", pws.get_slot_password(1).unwrap());
+
+    assert!(pws.erase_slot(1).is_ok());
+    // TODO: check error codes
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_name(1));
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_login(1));
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_password(1));
+
+    let name = "with å";
+    let login = "pär@test.com";
+    let password = "'i3lJc[09?I:,[u7dWz9";
+    assert!(pws.write_slot(1, name, login, password).is_ok());
+    assert_eq!(name, pws.get_slot_name(1).unwrap());
+    assert_eq!(login, pws.get_slot_login(1).unwrap());
+    assert_eq!(password, pws.get_slot_password(1).unwrap());
+
+    assert_eq!(
+        Err(CommandError::InvalidSlot),
+        pws.get_slot_name(SLOT_COUNT)
+    );
+    assert_eq!(
+        Err(CommandError::InvalidSlot),
+        pws.get_slot_login(SLOT_COUNT)
+    );
+    assert_eq!(
+        Err(CommandError::InvalidSlot),
+        pws.get_slot_password(SLOT_COUNT)
+    );
+}
+
+#[test]
+#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)]
+fn write() {
+    let device = Target::connect().unwrap();
+    let pws = get_pws(&device);
+
+    assert_eq!(
+        Err(CommandError::InvalidSlot),
+        pws.write_slot(SLOT_COUNT, "name", "login", "password")
+    );
+
+    assert!(pws.write_slot(0, "", "login", "password").is_ok());
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_name(0));
+    assert_eq!(Ok(String::from("login")), pws.get_slot_login(0));
+    assert_eq!(Ok(String::from("password")), pws.get_slot_password(0));
+
+    assert!(pws.write_slot(0, "name", "", "password").is_ok());
+    assert_eq!(Ok(String::from("name")), pws.get_slot_name(0));
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_login(0));
+    assert_eq!(Ok(String::from("password")), pws.get_slot_password(0));
+
+    assert!(pws.write_slot(0, "name", "login", "").is_ok());
+    assert_eq!(Ok(String::from("name")), pws.get_slot_name(0));
+    assert_eq!(Ok(String::from("login")), pws.get_slot_login(0));
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_password(0));
+}
+
+#[test]
+#[cfg_attr(not(any(feature = "test-pro", feature = "test-storage")), ignore)]
+fn erase() {
+    let device = Target::connect().unwrap();
+    let pws = get_pws(&device);
+    assert_eq!(Err(CommandError::InvalidSlot), pws.erase_slot(SLOT_COUNT));
+
+    assert!(pws.write_slot(0, "name", "login", "password").is_ok());
+    assert!(pws.erase_slot(0).is_ok());
+    assert!(pws.erase_slot(0).is_ok());
+    assert_eq!(Err(CommandError::Unknown), pws.get_slot_name(0));
+}