From 3d54b4ea0c96a2420973dc840c1b32545bf2b05d Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Wed, 18 Jan 2017 00:11:25 +0100
Subject: Fix getting card serial

todo: remove whitespace at the string end
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 misc.cc | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'misc.cc')

diff --git a/misc.cc b/misc.cc
index 3f15520..a76bfb6 100644
--- a/misc.cc
+++ b/misc.cc
@@ -36,7 +36,8 @@ std::vector<uint8_t> hex_string_to_byte(const char* hexString){
 };
 
 #include <cctype>
-std::string hexdump(const char *p, size_t size, bool print_header) {
+std::string hexdump(const char *p, size_t size, bool print_header,
+        bool print_ascii, bool print_empty) {
   std::stringstream out;
   char formatbuf[128];
   const char *pstart = p;
@@ -53,18 +54,20 @@ std::string hexdump(const char *p, size_t size, bool print_header) {
         snprintf(formatbuf, 128, "%02x ", uint8_t(*p));
         out << formatbuf;
       } else {
-        out << "-- ";
+          if(print_empty)
+            out << "-- ";
       }
 
     }
-    out << "\t";
-
-    for (const char *le = pp + 16; pp < le && pp < pend; pp++) {
-      if (std::isgraph(*pp))
-        out << uint8_t(*pp);
-      else
-        out << '.';
-    }
+      if(print_ascii){
+        out << "\t";
+        for (const char *le = pp + 16; pp < le && pp < pend; pp++) {
+          if (std::isgraph(*pp))
+            out << uint8_t(*pp);
+          else
+            out << '.';
+        }
+      }
     out << std::endl;
   }
   return out.str();
-- 
cgit v1.2.1


From adbc664125142c434294bfa795666c90c7608429 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Thu, 9 Mar 2017 18:49:24 +0100
Subject: Adjust for compilation on Visual Studio 2017

Building works however tests are not. Possibly linking with original hidapi solution would work.
---
 misc.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'misc.cc')

diff --git a/misc.cc b/misc.cc
index a76bfb6..f85d486 100644
--- a/misc.cc
+++ b/misc.cc
@@ -5,18 +5,19 @@
 #include <cstdlib>
 #include <cstring>
 #include "LibraryException.h"
+#include <vector>
 
 namespace nitrokey {
 namespace misc {
 
-std::vector<uint8_t> hex_string_to_byte(const char* hexString){
+::std::vector<uint8_t> hex_string_to_byte(const char* hexString){
     const size_t big_string_size = 256; //arbitrary 'big' number
     const size_t s_size = strlen(hexString);
     const size_t d_size = s_size/2;
     if (s_size%2!=0 || s_size>big_string_size){
         throw InvalidHexString(0);
     }
-    auto data = std::vector<uint8_t>();
+    auto data = ::std::vector<uint8_t>();
     data.reserve(d_size);
 
     char buf[2];
@@ -36,9 +37,9 @@ std::vector<uint8_t> hex_string_to_byte(const char* hexString){
 };
 
 #include <cctype>
-std::string hexdump(const char *p, size_t size, bool print_header,
+::std::string hexdump(const char *p, size_t size, bool print_header,
         bool print_ascii, bool print_empty) {
-  std::stringstream out;
+  ::std::stringstream out;
   char formatbuf[128];
   const char *pstart = p;
 
@@ -68,7 +69,7 @@ std::string hexdump(const char *p, size_t size, bool print_header,
             out << '.';
         }
       }
-    out << std::endl;
+    out << ::std::endl;
   }
   return out.str();
 }
-- 
cgit v1.2.1


From 5650e48b114529075d89dbdde0330901351b8460 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Fri, 17 Feb 2017 16:29:21 +0100
Subject: Get proper card serial for Storage. Get serial as one number.

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 misc.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'misc.cc')

diff --git a/misc.cc b/misc.cc
index f85d486..5eb81b5 100644
--- a/misc.cc
+++ b/misc.cc
@@ -10,6 +10,8 @@
 namespace nitrokey {
 namespace misc {
 
+
+
 ::std::vector<uint8_t> hex_string_to_byte(const char* hexString){
     const size_t big_string_size = 256; //arbitrary 'big' number
     const size_t s_size = strlen(hexString);
-- 
cgit v1.2.1