From 9ad4796130a4ce192420563bb601468ffc292df9 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Mon, 31 Oct 2016 17:48:18 +0100
Subject: Code refactoring - unify password only commands

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 include/command.h | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'include/command.h')

diff --git a/include/command.h b/include/command.h
index 5ac1d7f..badf068 100644
--- a/include/command.h
+++ b/include/command.h
@@ -19,13 +19,18 @@ namespace nitrokey {
         };
 
 #define print_to_ss(x) ( ss << " " << (#x) <<":\t" << (x) << std::endl );
+namespace stick20{
+        enum class PasswordKind : uint8_t {
+            User = 'P',
+            Admin = 'A'
+        };
 
-        template<CommandID cmd_id>
+        template<CommandID cmd_id, PasswordKind Tpassword_kind = PasswordKind::User, int password_length = 20>
         class PasswordCommand : public Command<cmd_id> {
         public:
             struct CommandPayload {
                 uint8_t kind;
-                uint8_t password[20];
+                uint8_t password[password_length];
 
                 std::string dissect() const {
                   std::stringstream ss;
@@ -40,6 +45,21 @@ namespace nitrokey {
                   kind = (uint8_t) 'P';
                 }
 
+                void set_defaults(){
+                  set_kind(Tpassword_kind);
+                }
+
+                void set_kind(PasswordKind password_kind){
+                  switch (password_kind){
+                    case PasswordKind::Admin:
+                      set_kind_admin();
+                    break;
+                    case PasswordKind::User:
+                      set_kind_user();
+                    break;
+                  }
+                };
+
             } __packed;
 
             typedef Transaction<Command<cmd_id>::command_id(), struct CommandPayload, struct EmptyPayload>
@@ -47,6 +67,7 @@ namespace nitrokey {
 
         };
     }
+    }
 }
 #undef print_to_ss
 
-- 
cgit v1.2.1