diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2019-07-06 00:30:38 +0200 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2019-07-06 00:30:38 +0200 |
commit | d426f1a56fedbb8b9fdc6c797f837a770e923029 (patch) | |
tree | 84b6b6a6cbdda473c79c39544a7e1a3ea47da2ba /src/lib.rs | |
parent | 606177a61de39ba5e96390d63cff536f895d8c39 (diff) | |
parent | d95355e3d76c0c0022629e635f36a2dc325c0af2 (diff) | |
download | nitrokey-rs-d426f1a56fedbb8b9fdc6c797f837a770e923029.tar.gz nitrokey-rs-d426f1a56fedbb8b9fdc6c797f837a770e923029.tar.bz2 |
Merge branch 'revert' into next
The tests with the 0.4.0-alpha.1 version showed that the approach using
mutable references to the Device in User, Admin and PasswordSafe causes
problems in nitrocli, see [0]. Therefore, these changes are reverted.
[0] https://lists.sr.ht/~ireas/nitrokey-rs-dev/%3C43cc304d-23e8-7f95-2167-ce3f0530b81e%40posteo.net%3E
* revert:
Revert "Store mutable reference to Device in PasswordSafe"
Revert "Refactor User and Admin to use a mutable reference"
Diffstat (limited to 'src/lib.rs')
-rw-r--r-- | src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -44,7 +44,7 @@ //! # use nitrokey::Error; //! //! # fn try_main() -> Result<(), Error> { -//! let mut device = nitrokey::connect()?; +//! let device = nitrokey::connect()?; //! let slot_data = OtpSlotData::new(1, "test", "01234567890123456689", OtpMode::SixDigits); //! match device.authenticate_admin("12345678") { //! Ok(mut admin) => { @@ -53,7 +53,7 @@ //! Err(err) => eprintln!("Could not write slot: {}", err), //! } //! }, -//! Err(err) => eprintln!("Could not authenticate as admin: {}", err), +//! Err((_, err)) => eprintln!("Could not authenticate as admin: {}", err), //! } //! # Ok(()) //! # } |