aboutsummaryrefslogtreecommitdiff
path: root/NitrokeyManager.cc
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2016-11-09 19:22:46 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2016-12-03 16:01:49 +0100
commit2ba87abdb5c69e3d72b88164030ed5633986a63d (patch)
tree306d12e51452ed53a09ad7132f19ded512d652f6 /NitrokeyManager.cc
parentb94d61b2f3c446c46ac2f660d954841d740782f5 (diff)
downloadlibnitrokey-2ba87abdb5c69e3d72b88164030ed5633986a63d.tar.gz
libnitrokey-2ba87abdb5c69e3d72b88164030ed5633986a63d.tar.bz2
Convinient function for checking if authorization command is supported
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'NitrokeyManager.cc')
-rw-r--r--NitrokeyManager.cc16
1 files changed, 15 insertions, 1 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 20f4f14..b254071 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -3,6 +3,7 @@
#include "include/NitrokeyManager.h"
#include "include/LibraryException.h"
#include <algorithm>
+#include <unordered_map>
#include "include/misc.h"
namespace nitrokey{
@@ -35,7 +36,11 @@ namespace nitrokey{
// package type to auth, auth type [Authorize,UserAuthorize]
template <typename S, typename A, typename T>
- void authorize_packet(T &package, const char *admin_temporary_password, shared_ptr<Device> device){
+ void NitrokeyManager::authorize_packet(T &package, const char *admin_temporary_password, shared_ptr<Device> device){
+ if (!is_authorization_command_supported()){
+ Log::instance()("Authorization command not supported, skipping", Loglevel::WARNING);
+ return;
+ }
auto auth = get_payload<A>();
strcpyT(auth.temporary_password, admin_temporary_password);
auth.crc_to_authorize = S::CommandTransaction::getCRC(package);
@@ -480,6 +485,15 @@ namespace nitrokey{
return v;
}
+ bool NitrokeyManager::is_authorization_command_supported(){
+ auto m = std::unordered_map<DeviceModel , int, EnumClassHash>({
+ {DeviceModel::PRO, 7},
+ {DeviceModel::STORAGE, 43},
+ });
+ auto status_p = GetStatus::CommandTransaction::run(*device);
+ return status_p.data().firmware_version <= m[device->get_device_model()];
+ }
+
bool NitrokeyManager::is_AES_supported(const char *user_password) {
auto a = get_payload<IsAESSupported>();
strcpyT(a.user_password, user_password);