diff options
author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-03-01 11:29:57 +0100 |
---|---|---|
committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-03-01 11:35:00 +0100 |
commit | f5da7b4cbd508faef38fcdfff659fab5c4649838 (patch) | |
tree | 3d5a3bd22235468cde6a28cc9346691b2b52323c /NitrokeyManager.cc | |
parent | e6fc0cce3937b458179bed8648825f9f047a68d8 (diff) | |
download | libnitrokey-f5da7b4cbd508faef38fcdfff659fab5c4649838.tar.gz libnitrokey-f5da7b4cbd508faef38fcdfff659fab5c4649838.tar.bz2 |
Minor cleanup
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'NitrokeyManager.cc')
-rw-r--r-- | NitrokeyManager.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc index fa69ac6..e5f10df 100644 --- a/NitrokeyManager.cc +++ b/NitrokeyManager.cc @@ -142,7 +142,8 @@ using nitrokey::misc::strcpyT; const auto status = get_status_storage(); const auto sc_id = toHex(status.ActiveSmartCardID_u32); const auto sd_id = toHex(status.ActiveSD_CardID_u32); - id = sc_id + ":" + sd_id + "_p_" + p; + id += sc_id + ":" + sd_id; + id += "_p_" + p; } catch (const LongOperationInProgressException &e) { LOGD1(std::string("Long operation in progress, setting ID to: ") + p); @@ -162,18 +163,13 @@ using nitrokey::misc::strcpyT; } return res; } -/** - * Connect to the device using unique smartcard:datacard id. - * Needs list_device_by_cpuID run first - * @param id - * @return - */ + bool NitrokeyManager::connect_with_ID(const std::string id) { std::lock_guard<std::mutex> lock(mex_dev_com_manager); auto position = connected_devices_byID.find(id); if (position == connected_devices_byID.end()) { - LOGD1(std::string("Could not find device ")+id); + LOGD1(std::string("Could not find device ")+id + ". Refresh devices list with list_devices_by_cpuID()."); return false; } |