From 67b14773cf4ab1812af85d3aaf99bdc6119c5a8a Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Thu, 2 Apr 2020 15:02:36 +0200
Subject: NitrokeyManager: Also return serial number as u32

This patch adds the get_serial_number_as_u32 method to NitrokeyManager.
It returns the serial number as a 32-bit unsigned integer.  Previously,
we only returned it as a string generated from the integer value,
get_serial_number.

While get_serial_number returns an empty string if no device is
connected and "NA" if an unknown model is connected, the new method
throws a DeviceNotConnected exception in the first case and returns zero
in the second case as we cannot express the three states in one integer
return value.
---
 NitrokeyManager.cc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'NitrokeyManager.cc')

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 6c26a43..496496e 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -398,6 +398,25 @@ using nitrokey::misc::strcpyT;
       return "NA";
     }
 
+    uint32_t NitrokeyManager::get_serial_number_as_u32() {
+        if (device == nullptr) { throw DeviceNotConnected("device not connected"); }
+      switch (device->get_device_model()) {
+        case DeviceModel::PRO: {
+          auto response = GetStatus::CommandTransaction::run(device);
+          return response.data().card_serial_u32;
+        }
+          break;
+
+        case DeviceModel::STORAGE:
+        {
+          auto response = stick20::GetDeviceStatus::CommandTransaction::run(device);
+          return response.data().ActiveSmartCardID_u32;
+        }
+          break;
+      }
+      return 0;
+    }
+
     stick10::GetStatus::ResponsePayload NitrokeyManager::get_status(){
       try{
         auto response = GetStatus::CommandTransaction::run(device);
-- 
cgit v1.2.1


From 02f19713c155457e8cc7d80d581bdac35cb1716d Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Thu, 2 Apr 2020 15:14:11 +0200
Subject: NitrokeyManager: Refactor get_serial_number
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To avoid duplicate code, this patch refactors the get_serial_number
method to use get_serial_number_as_u32 internally.  It does not change
get_serial_number’s behavior.
---
 NitrokeyManager.cc | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'NitrokeyManager.cc')

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 496496e..b6a076a 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -380,22 +380,16 @@ using nitrokey::misc::strcpyT;
 
 
     string NitrokeyManager::get_serial_number() {
-        if (device == nullptr) { return ""; };
-      switch (device->get_device_model()) {
-        case DeviceModel::PRO: {
-          auto response = GetStatus::CommandTransaction::run(device);
-          return nitrokey::misc::toHex(response.data().card_serial_u32);
-        }
-          break;
-
-        case DeviceModel::STORAGE:
-        {
-          auto response = stick20::GetDeviceStatus::CommandTransaction::run(device);
-          return nitrokey::misc::toHex(response.data().ActiveSmartCardID_u32);
+      try {
+        auto serial_number = this->get_serial_number_as_u32();
+        if (serial_number == 0) {
+          return "NA";
+        } else {
+          return nitrokey::misc::toHex(serial_number);
         }
-          break;
+      } catch (DeviceNotConnected& e) {
+        return "";
       }
-      return "NA";
     }
 
     uint32_t NitrokeyManager::get_serial_number_as_u32() {
-- 
cgit v1.2.1