From 4dc73375e0364aea70b52682b916635b7b75a2eb Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Mon, 12 Aug 2019 22:07:44 -0700 Subject: Update nitrokey crate to 0.4.0-alpha.2 This change updates the dependency to nitrokey to version 0.4.0-alpha.2. In addition to minor interface changes for the get_*_firmware_version and get_*_retry_count functions, several functions that change the device state now require a mutable handle to the nitrokey. Hence, this patch a number of function signatures to accept mutable device objects. Import subrepo nitrokey/:nitrokey at 34efcfadf1436102e42144f710edabaa2c4b55cd --- nitrocli/src/tests/pin.rs | 4 ++-- nitrocli/src/tests/reset.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nitrocli/src/tests') diff --git a/nitrocli/src/tests/pin.rs b/nitrocli/src/tests/pin.rs index 051129c..e4cd316 100644 --- a/nitrocli/src/tests/pin.rs +++ b/nitrocli/src/tests/pin.rs @@ -29,12 +29,12 @@ fn unblock(device: nitrokey::DeviceWrapper) -> crate::Result<()> { nitrokey::Error::CommandError(err) if err == nitrokey::CommandError::WrongPassword => (), _ => panic!("Unexpected error variant found: {:?}", err), } - assert!(device.get_user_retry_count() < 3); + assert!(device.get_user_retry_count()? < 3); let model = device.get_model(); let _ = Nitrocli::with_dev(device).handle(&["pin", "unblock"])?; let device = nitrokey::connect_model(model)?; - assert_eq!(device.get_user_retry_count(), 3); + assert_eq!(device.get_user_retry_count()?, 3); Ok(()) } diff --git a/nitrocli/src/tests/reset.rs b/nitrocli/src/tests/reset.rs index 12d7023..f9452ec 100644 --- a/nitrocli/src/tests/reset.rs +++ b/nitrocli/src/tests/reset.rs @@ -42,7 +42,7 @@ fn reset(device: nitrokey::DeviceWrapper) -> crate::Result<()> { // Check that the admin PIN has been reset. let device = nitrokey::connect_model(ncli.model().unwrap())?; - let device = device + let mut device = device .authenticate_admin(nitrokey::DEFAULT_ADMIN_PIN) .unwrap(); -- cgit v1.2.1