diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2020-01-29 13:52:19 +0100 |
---|---|---|
committer | Robin Krahl <robin.krahl@ireas.org> | 2020-02-03 10:22:13 +0100 |
commit | c1f48ce6c614586042db8891d2eebf19d2212ce4 (patch) | |
tree | 9824d4552faf18a09eabb214deb87b4db950ab41 /src/config.rs | |
parent | 4a9dab94400cb00ae1e28485ddc64d46cf27ed3c (diff) | |
download | nitrokey-rs-c1f48ce6c614586042db8891d2eebf19d2212ce4.tar.gz nitrokey-rs-c1f48ce6c614586042db8891d2eebf19d2212ce4.tar.bz2 |
Use NK_get_status to implement Device::get_config
libnitrokey’s NK_read_config function returns a pointer to an array that
has been allocated using new[]. We would have to delete this pointer
using delete[], but we only have access to free. Therefore this patch
modifies the Device::get_config function to call NK_get_status instead
of NK_read_config.
This also makes the code more safe as we get the data as a struct
instead of an array. It does not add much overhead as NK_read_config
also executes the GET_STATUS command on the Nitrokey device.
Diffstat (limited to 'src/config.rs')
-rw-r--r-- | src/config.rs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/config.rs b/src/config.rs index 9b9de3c..120a51b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -94,17 +94,6 @@ impl From<&nitrokey_sys::NK_status> for RawConfig { } } -impl From<[u8; 5]> for RawConfig { - fn from(data: [u8; 5]) -> Self { - RawConfig { - numlock: data[0], - capslock: data[1], - scrollock: data[2], - user_password: data[3] != 0, - } - } -} - impl Into<Config> for RawConfig { fn into(self) -> Config { Config { |