From 33344655d519b351d17d4f166dba406d1ab79e8e Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 27 Jul 2016 06:16:00 +0200 Subject: Handle misc functions: factory reset, build aes key, unlock user password (not yet tested) Signed-off-by: Szczepan Zalega --- include/NitrokeyManager.h | 6 ++++++ include/stick10_commands.h | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h index e6e79c7..5bd253d 100644 --- a/include/NitrokeyManager.h +++ b/include/NitrokeyManager.h @@ -61,6 +61,12 @@ namespace nitrokey { void user_authenticate(const char *user_password, const char *temporary_password); + void factory_reset(const char *admin_password); + + void build_aes_key(const char *admin_password); + + void unlock_user_password(const char *admin_password); + private: NitrokeyManager(); ~NitrokeyManager(); diff --git a/include/stick10_commands.h b/include/stick10_commands.h index fbd0698..8dc1b22 100644 --- a/include/stick10_commands.h +++ b/include/stick10_commands.h @@ -637,7 +637,12 @@ class UserAuthorize : Command { class UnlockUserPassword : Command { public: struct CommandPayload { - uint8_t admin_password[20]; // TODO + uint8_t admin_password[20]; + std::string dissect() const { + std::stringstream ss; + ss << " admin_password:\t" << admin_password<< std::endl; + return ss.str(); + } } __packed; // TODO could we get the stick to return the retry count? @@ -700,7 +705,12 @@ class LockDevice : Command { class FactoryReset : Command { public: struct CommandPayload { - uint8_t password[20]; + uint8_t admin_password[20]; + std::string dissect() const { + std::stringstream ss; + ss << " admin_password:\t" << admin_password<< std::endl; + return ss.str(); + } } __packed; typedef Transaction @@ -710,7 +720,12 @@ class FactoryReset : Command { class BuildAESKey : Command { public: struct CommandPayload { - uint8_t password[20]; + uint8_t admin_password[20]; + std::string dissect() const { + std::stringstream ss; + ss << " admin_password:\t" << admin_password<< std::endl; + return ss.str(); + } } __packed; typedef Transaction -- cgit v1.2.1