From 0038f840f8279483e4a8fcb9edf800425fdb9fec Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Fri, 29 Jul 2016 15:15:35 +0200
Subject: Merge changing PIN functions

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 include/NitrokeyManager.h  | 2 ++
 include/stick20_commands.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h
index fdb485f..4f1dcfa 100644
--- a/include/NitrokeyManager.h
+++ b/include/NitrokeyManager.h
@@ -91,6 +91,8 @@ namespace nitrokey {
         bool erase_slot(uint8_t slot_number, const char *temporary_password);
         uint8_t *get_slot_name(uint8_t slot_number) const;
 
+        template <typename ProCommand, PasswordKind StoKind>
+        void change_PIN_general(char *current_PIN, char *new_PIN);
     };
 }
 
diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index 66fad15..ec1b088 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -21,7 +21,7 @@ namespace stick20 {
         Admin = 'A'
     };
 
-    class ChangeAdminPin20Current : Command<CommandID::STICK20_CMD_SEND_PASSWORD> {
+    class ChangeAdminUserPin20Current : Command<CommandID::STICK20_CMD_SEND_PASSWORD> {
   public:
       struct CommandPayload {
           uint8_t kind;
@@ -41,7 +41,7 @@ namespace stick20 {
   };
 
 
-    class ChangeAdminPin20New : Command<CommandID::STICK20_CMD_SEND_NEW_PASSWORD> {
+    class ChangeAdminUserPin20New : Command<CommandID::STICK20_CMD_SEND_NEW_PASSWORD> {
     public:
 
         struct CommandPayload {
-- 
cgit v1.2.3