diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2019-01-03 17:04:50 +0000 | 
|---|---|---|
| committer | Robin Krahl <robin.krahl@ireas.org> | 2019-01-03 18:06:30 +0100 | 
| commit | 616f84c13a4e676d3e2f870533fb1b8778c5f614 (patch) | |
| tree | d90e68cbc631280e45adf1e7cb04139693213f06 /src | |
| parent | 0a7a62c9af15b11e5dbfad1900ac89924457b272 (diff) | |
| download | nitrokey-rs-616f84c13a4e676d3e2f870533fb1b8778c5f614.tar.gz nitrokey-rs-616f84c13a4e676d3e2f870533fb1b8778c5f614.tar.bz2  | |
Add Device::build_aes_key method
This patch adds the build_aes_key method to the Device trait that uses
the NK_build_aes_key function to build new AES keys on the device.  This
effectively resets the password safe and the encrypted storage.  It is
unclear whether other data (e. g. the one-time passwords) are affected
too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/device.rs | 31 | ||||
| -rw-r--r-- | src/pws.rs | 6 | 
2 files changed, 37 insertions, 0 deletions
diff --git a/src/device.rs b/src/device.rs index 8702405..bc48cd2 100644 --- a/src/device.rs +++ b/src/device.rs @@ -540,6 +540,37 @@ pub trait Device: Authenticate + GetPasswordSafe + GenerateOtp {          let admin_pin_string = get_cstring(admin_pin)?;          unsafe { get_command_result(nitrokey_sys::NK_factory_reset(admin_pin_string.as_ptr())) }      } + +    /// Builds a new AES key on the Nitrokey. +    /// +    /// The AES key is used to encrypt the password safe and the encrypted volume.  You may need +    /// to call this method after a factory reset using `gpg --card-edit`.  You can also use it to +    /// destory the data stored in the password safe or on the encrypted volume. +    /// +    /// # Errors +    /// +    /// - [`InvalidString`][] if the provided password contains a null byte +    /// - [`WrongPassword`][] if the admin password is wrong +    /// +    /// # Example +    /// +    /// ```no_run +    /// use nitrokey::Device; +    /// # use nitrokey::CommandError; +    /// +    /// # fn try_main() -> Result<(), CommandError> { +    /// let device = nitrokey::connect()?; +    /// match device.build_aes_key("12345678") { +    ///     Ok(()) => println!("New AES keys have been built."), +    ///     Err(err) => println!("Could not build new AES keys: {}", err), +    /// }; +    /// #     Ok(()) +    /// # } +    /// ``` +    fn build_aes_key(&self, admin_pin: &str) -> Result<(), CommandError> { +        let admin_pin_string = get_cstring(admin_pin)?; +        unsafe { get_command_result(nitrokey_sys::NK_build_aes_key(admin_pin_string.as_ptr())) } +    }  }  /// Connects to a Nitrokey device.  This method can be used to connect to any connected device, @@ -71,6 +71,11 @@ pub trait GetPasswordSafe {      /// has been used.  Otherwise, other applications can access the password store without      /// authentication.      /// +    /// If this method returns an `AesDecryptionFailed` (Nitrokey Pro) or `Unknown` (Nitrokey +    /// Storage) error, the AES data object on the smart card could not be accessed.  This problem +    /// occurs after a factory reset using `gpg --card-edit` and can be fixed using the +    /// [`Device::build_aes_key`][] command. +    ///      /// # Errors      ///      /// - [`AesDecryptionFailed`][] if the secret for the password safe could not be decrypted @@ -104,6 +109,7 @@ pub trait GetPasswordSafe {      /// [`device`]: struct.PasswordSafe.html#method.device      /// [`lock`]: trait.Device.html#method.lock      /// [`AesDecryptionFailed`]: enum.CommandError.html#variant.AesDecryptionFailed +    /// [`Device::build_aes_key`]: trait.Device.html#method.build_aes_key      /// [`InvalidString`]: enum.CommandError.html#variant.InvalidString      /// [`Unknown`]: enum.CommandError.html#variant.Unknown      /// [`WrongPassword`]: enum.CommandError.html#variant.WrongPassword  | 
