aboutsummaryrefslogtreecommitdiff
path: root/include/stick10_commands.h
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-02-17 16:29:21 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 15:41:47 +0100
commit5650e48b114529075d89dbdde0330901351b8460 (patch)
treec07b6715adaa10bafd76841ef1226a3659ca7d9d /include/stick10_commands.h
parent4e26fdee0c1435016d6642cf8c1f88c3dd5495fa (diff)
downloadlibnitrokey-5650e48b114529075d89dbdde0330901351b8460.tar.gz
libnitrokey-5650e48b114529075d89dbdde0330901351b8460.tar.bz2
Get proper card serial for Storage. Get serial as one number.
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'include/stick10_commands.h')
-rw-r--r--include/stick10_commands.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/include/stick10_commands.h b/include/stick10_commands.h
index 3d9e234..843d8bd 100644
--- a/include/stick10_commands.h
+++ b/include/stick10_commands.h
@@ -348,7 +348,10 @@ class GetStatus : Command<CommandID::GET_STATUS> {
public:
struct ResponsePayload {
uint16_t firmware_version;
- uint8_t card_serial[4];
+ union{
+ uint8_t card_serial[4];
+ uint32_t card_serial_i;
+ } __packed;
union {
uint8_t general_config[5];
struct{
@@ -357,19 +360,12 @@ class GetStatus : Command<CommandID::GET_STATUS> {
uint8_t scrolllock; /** same as numlock */
uint8_t enable_user_password;
uint8_t delete_user_password;
- };
- };
+ } __packed;
+ } __packed;
bool isValid() const { return enable_user_password!=delete_user_password; }
std::string get_card_serial_hex() const {
-// return ::nitrokey::misc::hexdump((const char *)(card_serial),
-// sizeof card_serial, false, false, false);
- std::stringstream ss;
- ss << std::hex << std::setfill('0');
- for (int i = 0; i < sizeof(card_serial); ++i) {
- ss << std::setw(2) << static_cast<unsigned>(card_serial[i]);
- }
- return ss.str();
+ return nitrokey::misc::toHex(card_serial_i);
}
std::string dissect() const {
@@ -378,6 +374,7 @@ class GetStatus : Command<CommandID::GET_STATUS> {
<< "[" << firmware_version << "]" << "\t"
<< ::nitrokey::misc::hexdump(
(const char *)(&firmware_version), sizeof firmware_version, false);
+ ss << "card_serial_i:\t" << std::hex << card_serial_i << std::endl;
ss << "card_serial:\t"
<< ::nitrokey::misc::hexdump((const char *)(card_serial),
sizeof card_serial, false);