aboutsummaryrefslogtreecommitdiff
path: root/src/device/wrapper.rs
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2020-01-11 20:05:39 +0100
committerRobin Krahl <robin.krahl@ireas.org>2020-01-11 20:25:56 +0100
commitdbee55efa41496c8a683bfab96163facc93d6639 (patch)
tree93aa1d17acd18b6884b8421c593dab6e7cbf6011 /src/device/wrapper.rs
parent1532f92de1d63613602acb0b68486361571f3e50 (diff)
downloadnitrokey-rs-dbee55efa41496c8a683bfab96163facc93d6639.tar.gz
nitrokey-rs-dbee55efa41496c8a683bfab96163facc93d6639.tar.bz2
Add support for the GET_STATUS command
This patch adds support for the GET_STATUS command that returns the status information common to all Nitrokey devices. It can be accessed using the Device::get_status function and is stored in a Status struct. Due to a bug in the Storage firmware [0], the GET_STATUS command returns wrong firmware versions and serial numbers. Until this is fixed in libnitrokey [1], we have to manually execute the GET_DEVICE_STATUS command to fix these values for the Nitrokey Storage. Also, this leads to a name clash with the existing Storage::get_status function, which will be renamed in an upcoming patch. [0] https://github.com/Nitrokey/nitrokey-storage-firmware/issues/96 [1] https://github.com/Nitrokey/libnitrokey/issues/166
Diffstat (limited to 'src/device/wrapper.rs')
-rw-r--r--src/device/wrapper.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/device/wrapper.rs b/src/device/wrapper.rs
index a3a18f9..adbb695 100644
--- a/src/device/wrapper.rs
+++ b/src/device/wrapper.rs
@@ -1,7 +1,7 @@
// Copyright (C) 2018-2019 Robin Krahl <robin.krahl@ireas.org>
// SPDX-License-Identifier: MIT
-use crate::device::{Device, Model, Pro, Storage};
+use crate::device::{Device, Model, Pro, Status, Storage};
use crate::error::Error;
use crate::otp::GenerateOtp;
@@ -131,4 +131,11 @@ impl<'a> Device<'a> for DeviceWrapper<'a> {
DeviceWrapper::Storage(_) => Model::Storage,
}
}
+
+ fn get_status(&self) -> Result<Status, Error> {
+ match self {
+ DeviceWrapper::Pro(dev) => dev.get_status(),
+ DeviceWrapper::Storage(dev) => Device::get_status(dev),
+ }
+ }
}