From 1e07212370806f3ea4ff7a6f66e5716b60ab1f77 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Tue, 14 Jan 2020 19:21:26 +0100 Subject: Bump nitrokey dependency to version 0.5.1 This change updates the version of the nitrokey crate that we use to 0.5.1. As part of that, it replaces occurrences of Storage::get_status with Storage::get_storage_status as the method has been renamed. Import subrepo nitrokey/:nitrokey at 817409140a8778215d2d65d614d3672166fff576 --- nitrocli/CHANGELOG.md | 1 + nitrocli/Cargo.lock | 4 ++-- nitrocli/Cargo.toml | 3 +-- nitrocli/src/commands.rs | 2 +- nitrocli/src/tests/encrypted.rs | 8 ++++---- nitrocli/src/tests/hidden.rs | 8 ++++---- nitrocli/src/tests/lock.rs | 2 +- nitrocli/src/tests/unencrypted.rs | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'nitrocli') diff --git a/nitrocli/CHANGELOG.md b/nitrocli/CHANGELOG.md index 2a485ec..331e60b 100644 --- a/nitrocli/CHANGELOG.md +++ b/nitrocli/CHANGELOG.md @@ -4,6 +4,7 @@ Unreleased - Added `structopt` dependency in version `0.3.7` - Replaced `argparse` with `structopt` - Removed the `argparse` dependency +- Bumped `nitrokey` dependency to `0.5.1` 0.3.1 diff --git a/nitrocli/Cargo.lock b/nitrocli/Cargo.lock index 6760bb8..5f9eacf 100644 --- a/nitrocli/Cargo.lock +++ b/nitrocli/Cargo.lock @@ -68,7 +68,7 @@ version = "0.3.1" dependencies = [ "base32 0.4.0", "libc 0.2.66", - "nitrokey 0.4.0", + "nitrokey 0.5.1", "nitrokey-test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "nitrokey-test-state 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -77,7 +77,7 @@ dependencies = [ [[package]] name = "nitrokey" -version = "0.4.0" +version = "0.5.1" dependencies = [ "lazy_static 1.4.0", "libc 0.2.66", diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml index 8127f7a..b69a2bb 100644 --- a/nitrocli/Cargo.toml +++ b/nitrocli/Cargo.toml @@ -44,13 +44,12 @@ incremental = false [dependencies.base32] version = "0.4.0" -path = "../base32" [dependencies.libc] version = "0.2" [dependencies.nitrokey] -version = "0.4.0" +version = "0.5.1" [dependencies.structopt] version = "0.3.7" diff --git a/nitrocli/src/commands.rs b/nitrocli/src/commands.rs index 537a2cf..cc57786 100644 --- a/nitrocli/src/commands.rs +++ b/nitrocli/src/commands.rs @@ -356,7 +356,7 @@ fn print_status( if let nitrokey::DeviceWrapper::Storage(device) = device { let status = device - .get_status() + .get_storage_status() .map_err(|err| get_error("Getting Storage status failed", err))?; print_storage_status(ctx, &status) diff --git a/nitrocli/src/tests/encrypted.rs b/nitrocli/src/tests/encrypted.rs index 75b84c3..aed2662 100644 --- a/nitrocli/src/tests/encrypted.rs +++ b/nitrocli/src/tests/encrypted.rs @@ -77,8 +77,8 @@ fn encrypted_open_close(model: nitrokey::Model) -> crate::Result<()> { { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(device.get_status()?.encrypted_volume.active); - assert!(!device.get_status()?.hidden_volume.active); + assert!(device.get_storage_status()?.encrypted_volume.active); + assert!(!device.get_storage_status()?.hidden_volume.active); } let out = ncli.handle(&["encrypted", "close"])?; @@ -87,8 +87,8 @@ fn encrypted_open_close(model: nitrokey::Model) -> crate::Result<()> { { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(!device.get_status()?.encrypted_volume.active); - assert!(!device.get_status()?.hidden_volume.active); + assert!(!device.get_storage_status()?.encrypted_volume.active); + assert!(!device.get_storage_status()?.hidden_volume.active); } Ok(()) diff --git a/nitrocli/src/tests/hidden.rs b/nitrocli/src/tests/hidden.rs index 28a5d23..eabcfd4 100644 --- a/nitrocli/src/tests/hidden.rs +++ b/nitrocli/src/tests/hidden.rs @@ -31,8 +31,8 @@ fn hidden_create_open_close(model: nitrokey::Model) -> crate::Result<()> { { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(!device.get_status()?.encrypted_volume.active); - assert!(device.get_status()?.hidden_volume.active); + assert!(!device.get_storage_status()?.encrypted_volume.active); + assert!(device.get_storage_status()?.hidden_volume.active); } let out = ncli.handle(&["hidden", "close"])?; @@ -41,8 +41,8 @@ fn hidden_create_open_close(model: nitrokey::Model) -> crate::Result<()> { { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(!device.get_status()?.encrypted_volume.active); - assert!(!device.get_status()?.hidden_volume.active); + assert!(!device.get_storage_status()?.encrypted_volume.active); + assert!(!device.get_storage_status()?.hidden_volume.active); } Ok(()) diff --git a/nitrocli/src/tests/lock.rs b/nitrocli/src/tests/lock.rs index 5140152..b29f394 100644 --- a/nitrocli/src/tests/lock.rs +++ b/nitrocli/src/tests/lock.rs @@ -38,7 +38,7 @@ fn lock_storage(model: nitrokey::Model) -> crate::Result<()> { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(!device.get_status()?.encrypted_volume.active); + assert!(!device.get_storage_status()?.encrypted_volume.active); Ok(()) } diff --git a/nitrocli/src/tests/unencrypted.rs b/nitrocli/src/tests/unencrypted.rs index 547dcaf..ceeb17c 100644 --- a/nitrocli/src/tests/unencrypted.rs +++ b/nitrocli/src/tests/unencrypted.rs @@ -28,8 +28,8 @@ fn unencrypted_set_read_write(model: nitrokey::Model) -> crate::Result<()> { { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(device.get_status()?.unencrypted_volume.active); - assert!(!device.get_status()?.unencrypted_volume.read_only); + assert!(device.get_storage_status()?.unencrypted_volume.active); + assert!(!device.get_storage_status()?.unencrypted_volume.read_only); } let out = ncli.handle(&["unencrypted", "set", "read-only"])?; @@ -38,8 +38,8 @@ fn unencrypted_set_read_write(model: nitrokey::Model) -> crate::Result<()> { { let mut manager = nitrokey::force_take()?; let device = manager.connect_storage()?; - assert!(device.get_status()?.unencrypted_volume.active); - assert!(device.get_status()?.unencrypted_volume.read_only); + assert!(device.get_storage_status()?.unencrypted_volume.active); + assert!(device.get_storage_status()?.unencrypted_volume.read_only); } Ok(()) -- cgit v1.2.1