aboutsummaryrefslogtreecommitdiff
path: root/include/stick10_commands.h
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-02-17 17:52:54 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 15:41:48 +0100
commit0fb8c08704a338bb9f1b7d3ead4b488bf65cf51e (patch)
tree71a095ba99880a86b6274f04f4de7996d278836c /include/stick10_commands.h
parent6061ee1af573147e41a0834d1c6628eda2fa2f7c (diff)
downloadlibnitrokey-0fb8c08704a338bb9f1b7d3ead4b488bf65cf51e.tar.gz
libnitrokey-0fb8c08704a338bb9f1b7d3ead4b488bf65cf51e.tar.bz2
Make names more consistent
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'include/stick10_commands.h')
-rw-r--r--include/stick10_commands.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/stick10_commands.h b/include/stick10_commands.h
index 843d8bd..676aabc 100644
--- a/include/stick10_commands.h
+++ b/include/stick10_commands.h
@@ -350,7 +350,7 @@ class GetStatus : Command<CommandID::GET_STATUS> {
uint16_t firmware_version;
union{
uint8_t card_serial[4];
- uint32_t card_serial_i;
+ uint32_t card_serial_u32;
} __packed;
union {
uint8_t general_config[5];
@@ -365,7 +365,7 @@ class GetStatus : Command<CommandID::GET_STATUS> {
bool isValid() const { return enable_user_password!=delete_user_password; }
std::string get_card_serial_hex() const {
- return nitrokey::misc::toHex(card_serial_i);
+ return nitrokey::misc::toHex(card_serial_u32);
}
std::string dissect() const {
@@ -374,7 +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_u32:\t" << std::hex << card_serial_u32 << std::endl;
ss << "card_serial:\t"
<< ::nitrokey::misc::hexdump((const char *)(card_serial),
sizeof card_serial, false);