summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-01-18 00:11:25 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 15:41:39 +0100
commit3d54b4ea0c96a2420973dc840c1b32545bf2b05d (patch)
tree3741caeaf40c6b98374bc01c4e34ed94decd6bd5 /include
parent56bd3e2c4353cfc1b902c6dfb55df0ef563c5372 (diff)
downloadlibnitrokey-3d54b4ea0c96a2420973dc840c1b32545bf2b05d.tar.gz
libnitrokey-3d54b4ea0c96a2420973dc840c1b32545bf2b05d.tar.bz2
Fix getting card serial
todo: remove whitespace at the string end Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'include')
-rw-r--r--include/misc.h3
-rw-r--r--include/stick10_commands.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/misc.h b/include/misc.h
index 5158de0..9e4659d 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -44,7 +44,8 @@ typename T::CommandPayload get_payload(){
CMDTYPE::CommandTransaction::run(stick, p);
}
- std::string hexdump(const char *p, size_t size, bool print_header=true);
+ std::string hexdump(const char *p, size_t size, bool print_header=true, bool print_ascii=true,
+ bool print_empty=true);
uint32_t stm_crc32(const uint8_t *data, size_t size);
std::vector<uint8_t> hex_string_to_byte(const char* hexString);
}
diff --git a/include/stick10_commands.h b/include/stick10_commands.h
index 9b72e92..fb362fb 100644
--- a/include/stick10_commands.h
+++ b/include/stick10_commands.h
@@ -332,7 +332,7 @@ class GetStatus : Command<CommandID::GET_STATUS> {
std::string get_card_serial_hex() const {
return ::nitrokey::misc::hexdump((const char *)(card_serial),
- sizeof card_serial, false);
+ sizeof card_serial, false, false, false);
}
std::string dissect() const {