From 945db76ab4c6eb42224f4d18f45e67390540b5d0 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 19 Oct 2016 11:54:01 +0200 Subject: Fix bug for setting HOTP counters - send uint64 (was uint8) Signed-off-by: Szczepan Zalega --- NK_C_API.cc | 2 +- NK_C_API.h | 2 +- NitrokeyManager.cc | 6 +++--- include/NitrokeyManager.h | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NK_C_API.cc b/NK_C_API.cc index 6265215..7110fca 100644 --- a/NK_C_API.cc +++ b/NK_C_API.cc @@ -223,7 +223,7 @@ extern int NK_erase_totp_slot(uint8_t slot_number, const char *temporary_passwor }); } -extern int NK_write_hotp_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint8_t hotp_counter, +extern int NK_write_hotp_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint64_t hotp_counter, bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, const char *temporary_password) { auto m = NitrokeyManager::instance(); diff --git a/NK_C_API.h b/NK_C_API.h index 3c851a5..728824d 100644 --- a/NK_C_API.h +++ b/NK_C_API.h @@ -167,7 +167,7 @@ extern int NK_erase_totp_slot(uint8_t slot_number, const char *temporary_passwor * @param temporary_password char[25](Pro) admin temporary password * @return command processing error code */ -extern int NK_write_hotp_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint8_t hotp_counter, +extern int NK_write_hotp_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint64_t hotp_counter, bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, const char *temporary_password); diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc index 47b68d4..a01dbec 100644 --- a/NitrokeyManager.cc +++ b/NitrokeyManager.cc @@ -179,9 +179,9 @@ namespace nitrokey{ std::copy(vec.begin(), vec.end(), dest); } - bool NitrokeyManager::write_HOTP_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint8_t hotp_counter, - bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, - const char *temporary_password) { + bool NitrokeyManager::write_HOTP_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint64_t hotp_counter, + bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, + const char *temporary_password) { if (!is_valid_hotp_slot_number(slot_number)) throw InvalidSlotException(slot_number); slot_number = get_internal_slot_number_for_hotp(slot_number); diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h index 1e518f4..52c18d7 100644 --- a/include/NitrokeyManager.h +++ b/include/NitrokeyManager.h @@ -22,9 +22,9 @@ namespace nitrokey { static shared_ptr instance(); bool first_authenticate(const char *pin, const char *temporary_password); - bool write_HOTP_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint8_t hotp_counter, - bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, - const char *temporary_password); + bool write_HOTP_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint64_t hotp_counter, + bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, + const char *temporary_password); bool write_TOTP_slot(uint8_t slot_number, const char *slot_name, const char *secret, uint16_t time_window, bool use_8_digits, bool use_enter, bool use_tokenID, const char *token_ID, const char *temporary_password); -- cgit v1.2.1