summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2016-12-06 19:56:14 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2016-12-06 19:56:42 +0100
commit740b85c7f935029003e205dcbb5d49842eac1ad6 (patch)
tree7cfbc8f2ea79499ee5d3beaf1770746791deed19 /include
parentf4b1f29058f55a716cb6e4e8a4f9bf0e6c7332fe (diff)
downloadlibnitrokey-740b85c7f935029003e205dcbb5d49842eac1ad6.tar.gz
libnitrokey-740b85c7f935029003e205dcbb5d49842eac1ad6.tar.bz2
Get major firmware version
Diffstat (limited to 'include')
-rw-r--r--include/NitrokeyManager.h3
-rw-r--r--include/stick20_commands.h10
2 files changed, 13 insertions, 0 deletions
diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h
index 14fa1e5..fd39445 100644
--- a/include/NitrokeyManager.h
+++ b/include/NitrokeyManager.h
@@ -115,6 +115,8 @@ namespace nitrokey {
template <typename S, typename A, typename T>
void authorize_packet(T &package, const char *admin_temporary_password, shared_ptr<Device> device);
+ int get_major_firmware_version();
+
private:
NitrokeyManager();
@@ -145,6 +147,7 @@ namespace nitrokey {
uint64_t counter_or_interval,
bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID,
const char *temporary_password) const;
+
};
}
diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index 1af9da3..e6df770 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -125,7 +125,17 @@ namespace nitrokey {
uint16_t MagicNumber_StickConfig_u16;
uint8_t ReadWriteFlagUncryptedVolume_u8;
uint8_t ReadWriteFlagCryptedVolume_u8;
+
+ union{
uint8_t VersionInfo_au8[4];
+ struct {
+ uint8_t __unused;
+ uint8_t major;
+ uint8_t __unused2;
+ uint8_t minor;
+ } __packed versionInfo;
+ };
+
uint8_t ReadWriteFlagHiddenVolume_u8;
uint8_t FirmwareLocked_u8;
uint8_t NewSDCardFound_u8;