From c1f48ce6c614586042db8891d2eebf19d2212ce4 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Wed, 29 Jan 2020 13:52:19 +0100
Subject: Use NK_get_status to implement Device::get_config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 src/config.rs | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/config.rs')

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 {
-- 
cgit v1.2.1