aboutsummaryrefslogtreecommitdiff
path: root/src/pws.rs
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2019-01-27 18:42:14 +0000
committerRobin Krahl <robin.krahl@ireas.org>2019-07-08 21:40:17 +0000
commitfe2f39826ade5a156945dabb8c8ab725378a15c1 (patch)
treecd2c9d662dd93813524c5227c2c44e52cadde20e /src/pws.rs
parent379bc798477a1de7ffda923c5d10ca63aebae25f (diff)
downloadnitrokey-rs-fe2f39826ade5a156945dabb8c8ab725378a15c1.tar.gz
nitrokey-rs-fe2f39826ade5a156945dabb8c8ab725378a15c1.tar.bz2
Store mutable reference to Manager in Device
In the last patches, we ensured that devices can only be obtained using the Manager struct. But we did not ensure that there is only one device at a time. This patch adds a mutable reference to the Manager instance to the Device implementations. The borrow checker makes sure that there is only one mutable reference at a time. In this patch, we have to remove the old connect, Pro::connect and Storage::connect functions as they do no longer compile. (They discard the MutexGuard which invalidates the reference to the Manager.) Therefore the tests do no longer compile.
Diffstat (limited to 'src/pws.rs')
-rw-r--r--src/pws.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pws.rs b/src/pws.rs
index 371de6e..cf2dd42 100644
--- a/src/pws.rs
+++ b/src/pws.rs
@@ -364,19 +364,19 @@ impl<'a> Drop for PasswordSafe<'a> {
}
}
-impl GetPasswordSafe for Pro {
+impl<'a> GetPasswordSafe for Pro<'a> {
fn get_password_safe(&mut self, user_pin: &str) -> Result<PasswordSafe<'_>, Error> {
get_password_safe(self, user_pin)
}
}
-impl GetPasswordSafe for Storage {
+impl<'a> GetPasswordSafe for Storage<'a> {
fn get_password_safe(&mut self, user_pin: &str) -> Result<PasswordSafe<'_>, Error> {
get_password_safe(self, user_pin)
}
}
-impl GetPasswordSafe for DeviceWrapper {
+impl<'a> GetPasswordSafe for DeviceWrapper<'a> {
fn get_password_safe(&mut self, user_pin: &str) -> Result<PasswordSafe<'_>, Error> {
get_password_safe(self, user_pin)
}