aboutsummaryrefslogtreecommitdiff
path: root/include/NitrokeyManager.h
diff options
context:
space:
mode:
authorElie Tournier <tournier.elie@gmail.com>2017-04-18 13:32:27 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-05-25 15:14:09 +0200
commit2428f3ad0a5542a996c16ef80fd7bbd2be5bb5c6 (patch)
tree2adb0370cf498acf12770d1e48439aee7055e9b1 /include/NitrokeyManager.h
parent05ae75697be8df1b2179035d3ef8dc6b2e7fe30f (diff)
downloadlibnitrokey-2428f3ad0a5542a996c16ef80fd7bbd2be5bb5c6.tar.gz
libnitrokey-2428f3ad0a5542a996c16ef80fd7bbd2be5bb5c6.tar.bz2
Rename functions: s/stick10/NKPro and s/stick20/NKStorage
Signed-off-by: Elie Tournier <tournier.elie@gmail.com>
Diffstat (limited to 'include/NitrokeyManager.h')
-rw-r--r--include/NitrokeyManager.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h
index f6977d9..216ff88 100644
--- a/include/NitrokeyManager.h
+++ b/include/NitrokeyManager.h
@@ -13,8 +13,8 @@
namespace nitrokey {
using namespace nitrokey::device;
using namespace std;
- using namespace nitrokey::proto::stick10;
- using namespace nitrokey::proto::stick20;
+ using namespace nitrokey::proto::NKPro;
+ using namespace nitrokey::proto::NKStorage;
using namespace nitrokey::proto;
using namespace nitrokey::log;
@@ -39,8 +39,8 @@ char * strndup(const char* str, size_t maxlen);
uint8_t last_interval,
const char *user_temporary_password);
string get_TOTP_code(uint8_t slot_number, const char *user_temporary_password);
- stick10::ReadSlot::ResponsePayload get_TOTP_slot_data(const uint8_t slot_number);
- stick10::ReadSlot::ResponsePayload get_HOTP_slot_data(const uint8_t slot_number);
+ NKPro::ReadSlot::ResponsePayload get_TOTP_slot_data(const uint8_t slot_number);
+ NKPro::ReadSlot::ResponsePayload get_HOTP_slot_data(const uint8_t slot_number);
bool set_time(uint64_t time);
bool get_time(uint64_t time = 0);
@@ -55,7 +55,7 @@ char * strndup(const char* str, size_t maxlen);
DeviceModel get_connected_device_model() const;
void set_debug(bool state);
- stick10::GetStatus::ResponsePayload get_status();
+ NKPro::GetStatus::ResponsePayload get_status();
string get_status_as_string();
string get_serial_number();
@@ -126,7 +126,7 @@ char * strndup(const char* str, size_t maxlen);
void send_startup(uint64_t seconds_from_epoch);
const char * get_status_storage_as_string();
- stick20::DeviceConfigurationResponsePacket::ResponsePayload get_status_storage();
+ NKStorage::DeviceConfigurationResponsePacket::ResponsePayload get_status_storage();
const char *get_SD_usage_data_as_string();
std::pair<uint8_t,uint8_t> get_SD_usage_data();
@@ -150,7 +150,7 @@ char * strndup(const char* str, size_t maxlen);
static shared_ptr <NitrokeyManager> _instance;
std::shared_ptr<Device> device;
- stick10::ReadSlot::ResponsePayload get_OTP_slot_data(const uint8_t slot_number);
+ NKPro::ReadSlot::ResponsePayload get_OTP_slot_data(const uint8_t slot_number);
bool is_valid_hotp_slot_number(uint8_t slot_number) const;
bool is_valid_totp_slot_number(uint8_t slot_number) const;
bool is_valid_password_safe_slot_number(uint8_t slot_number) const;