diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2019-01-15 17:03:54 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2019-01-15 17:03:54 +0100 |
| commit | 6bd77fce8400ecf531a4f7ff56431010b6bbb6f1 (patch) | |
| tree | 2b428a23bddbd87c08ee47351bc31768f54b63fe /libnitrokey/NitrokeyManager.h | |
| parent | 8d67c0f80aab724d67a1b6efb8af16aa71631a84 (diff) | |
| parent | e853275784e48823be0f39f0855efbe85c0f905c (diff) | |
| download | libnitrokey-6bd77fce8400ecf531a4f7ff56431010b6bbb6f1.tar.gz libnitrokey-6bd77fce8400ecf531a4f7ff56431010b6bbb6f1.tar.bz2 | |
Merge branch 'contributions'
Multiple PR's merged and tested as a whole
Platform:
Pro v0.7
Storage v0.53
Fedora 29
Run Python tests
Diffstat (limited to 'libnitrokey/NitrokeyManager.h')
| -rw-r--r-- | libnitrokey/NitrokeyManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnitrokey/NitrokeyManager.h b/libnitrokey/NitrokeyManager.h index d6e5df4..6908143 100644 --- a/libnitrokey/NitrokeyManager.h +++ b/libnitrokey/NitrokeyManager.h @@ -80,7 +80,7 @@ char * strndup(const char* str, size_t maxlen); bool get_time(uint64_t time = 0); bool erase_totp_slot(uint8_t slot_number, const char *temporary_password); bool erase_hotp_slot(uint8_t slot_number, const char *temporary_password); - std::vector<std::string> list_devices(); + std::vector<DeviceInfo> list_devices(); std::vector<std::string> list_devices_by_cpuID(); /** |