aboutsummaryrefslogtreecommitdiff
path: root/include/stick10_commands.h
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-03-09 18:49:24 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 15:41:45 +0100
commitadbc664125142c434294bfa795666c90c7608429 (patch)
tree15db66af5acd4422b5e66678dbe45a953b9dbdb0 /include/stick10_commands.h
parentc69604e8ba099b1421af86c34d904b0b380f996c (diff)
downloadlibnitrokey-adbc664125142c434294bfa795666c90c7608429.tar.gz
libnitrokey-adbc664125142c434294bfa795666c90c7608429.tar.bz2
Adjust for compilation on Visual Studio 2017
Building works however tests are not. Possibly linking with original hidapi solution would work.
Diffstat (limited to 'include/stick10_commands.h')
-rw-r--r--include/stick10_commands.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/stick10_commands.h b/include/stick10_commands.h
index 8d37dbd..3d9e234 100644
--- a/include/stick10_commands.h
+++ b/include/stick10_commands.h
@@ -1,5 +1,6 @@
#ifndef STICK10_COMMANDS_H
#define STICK10_COMMANDS_H
+
#include <bitset>
#include <iomanip>
#include <string>
@@ -8,9 +9,13 @@
#include "command.h"
#include "device_proto.h"
+#pragma pack (push,1)
+
namespace nitrokey {
namespace proto {
+
+
/*
* Stick10 protocol definition
*/
@@ -844,8 +849,11 @@ class BuildAESKey : Command<CommandID::NEW_AES_KEY> {
typedef Transaction<command_id(), struct CommandPayload, struct EmptyPayload>
CommandTransaction;
+
};
+
}
}
}
+#pragma pack (pop)
#endif