diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-01-13 12:11:18 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 15:41:38 +0100 |
| commit | ffcb53e4cb3419ea31bf7b22e5f0c42fd54041da (patch) | |
| tree | a453e235a84815fa781eb3aeee94210764e681d2 | |
| parent | deed3e733e7158859fd48ef51b64d924ea4e8184 (diff) | |
| download | libnitrokey-ffcb53e4cb3419ea31bf7b22e5f0c42fd54041da.tar.gz libnitrokey-ffcb53e4cb3419ea31bf7b22e5f0c42fd54041da.tar.bz2 | |
Name fix for firmware version getter
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| -rw-r--r-- | NK_C_API.cc | 2 | ||||
| -rw-r--r-- | NitrokeyManager.cc | 4 | ||||
| -rw-r--r-- | include/NitrokeyManager.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/NK_C_API.cc b/NK_C_API.cc index 224a3a8..f396fcb 100644 --- a/NK_C_API.cc +++ b/NK_C_API.cc @@ -474,7 +474,7 @@ extern int NK_get_progress_bar_value() { extern int NK_get_major_firmware_version(){ auto m = NitrokeyManager::instance(); return get_with_result([&](){ - return m->get_major_firmware_version(); + return m->get_minor_firmware_version(); }); } diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc index f92f5f7..37e35e5 100644 --- a/NitrokeyManager.cc +++ b/NitrokeyManager.cc @@ -612,7 +612,7 @@ namespace nitrokey{ {DeviceModel::PRO, 7}, {DeviceModel::STORAGE, 43}, }); - return get_major_firmware_version() <= m[device->get_device_model()]; + return get_minor_firmware_version() <= m[device->get_device_model()]; } DeviceModel NitrokeyManager::get_connected_device_model() const{ @@ -620,7 +620,7 @@ namespace nitrokey{ return device->get_device_model(); } - int NitrokeyManager::get_major_firmware_version(){ + int NitrokeyManager::get_minor_firmware_version(){ switch(device->get_device_model()){ case DeviceModel::PRO:{ auto status_p = GetStatus::CommandTransaction::run(*device); diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h index e96ac22..c7d7704 100644 --- a/include/NitrokeyManager.h +++ b/include/NitrokeyManager.h @@ -119,7 +119,7 @@ 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(); + int get_minor_firmware_version(); explicit NitrokeyManager(); private: |