Add temporary passwords to commands instead of AUTHORIZE

src/inc/report_protocol.h

@@ -18,7 +18,7 @@
  * along with Nitrokey. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FIRMWARE_VERSION 07
+#define FIRMWARE_VERSION (0x08)
 
 #define CMD_GET_STATUS                      0x00
 #define CMD_WRITE_TO_SLOT                   0x01
@@ -41,6 +41,7 @@
 #define CMD_FACTORY_RESET                   0x13
 #define CMD_CHANGE_USER_PIN                 0x14
 #define CMD_CHANGE_ADMIN_PIN                0x15
+#define CMD_WRITE_TO_SLOT_2                 0x16
 
 #define CMD_GET_PW_SAFE_SLOT_STATUS       0x60
 #define CMD_GET_PW_SAFE_SLOT_NAME         0x61
@@ -127,8 +128,9 @@
 
  */
 
-#define CMD_GC_SLOT_NUMBER_OFFSET   1
-#define CMD_GC_CHALLENGE_OFFSET     2
+#define CMD_GC_SLOT_NUMBER_OFFSET   (1)
+#define CMD_GC_CHALLENGE_OFFSET     (CMD_GC_SLOT_NUMBER_OFFSET + 1)
+#define CMD_GC_PASSWORD_OFFSET      (CMD_GC_CHALLENGE_OFFSET + 8 + 8 + 1)
 
 /*
  * CMD_GET_PASSWORD_RETRY_COUNT
@@ -157,24 +159,9 @@
  */
 
 
-/*
-   CMD_AUTHORIZE
-
-   report: 1b command type 4b authorized crc 25b temporary password
-
-
- */
-
-
 
 __IO extern uint8_t device_status;
 
-extern __IO uint8_t temp_password[25];
-
-extern __IO uint8_t tmp_password_set;
-
-extern __IO uint32_t authorized_crc;
-
 uint8_t parse_report (uint8_t * report, uint8_t * output);
 
 uint8_t cmd_get_status (uint8_t * report, uint8_t * output);
@@ -193,14 +180,10 @@ uint8_t cmd_erase_slot (uint8_t * report, uint8_t * output);
 
 uint8_t cmd_first_authenticate (uint8_t * report, uint8_t * output);
 
-uint8_t cmd_authorize (uint8_t * report, uint8_t * output);
-
 uint8_t cmd_get_password_retry_count (uint8_t * report, uint8_t * output);
 
 uint8_t cmd_user_authenticate (uint8_t * report, uint8_t * output);
 
-uint8_t cmd_user_authorize (uint8_t * report, uint8_t * output);
-
 uint8_t cmd_factory_reset (uint8_t * report, uint8_t * output);
 
 uint8_t cmd_get_user_password_retry_count (uint8_t * report, uint8_t * output);
@@ -245,3 +228,75 @@ uint8_t cmd_getProDebug (uint8_t * report, uint8_t * output);
 /*
    uint8_t cmd_test_counter(uint8_t *report,uint8_t *output); uint8_t cmd_test_time(uint8_t *report,uint8_t *output); */
 // END - OTP Test Routine ----------------------------------
+
+#define __packed __attribute__((__packed__))
+
+
+typedef struct {
+    uint8_t _command_type;
+    uint8_t temporary_admin_password[25];
+    uint8_t slot_secret[20];
+    union {
+        uint8_t _slot_config;
+        struct {
+            bool use_8_digits   : 1;
+            bool use_enter      : 1;
+            bool use_tokenID    : 1;
+        };
+    };
+    union {
+        uint8_t slot_token_id[13]; /** OATH Token Identifier */
+        struct { /** @see https://openauthentication.org/token-specs/ */
+            uint8_t omp[2];
+            uint8_t tt[2];
+            uint8_t mui[8];
+            uint8_t keyboard_layout; //disabled feature in nitroapp as of 20160805
+        } slot_token_fields;
+    };
+} __packed write_to_slot_1_payload;
+
+typedef struct {
+    uint8_t _command_type;
+    uint8_t temporary_admin_password[25];
+    uint8_t slot_number;
+    uint8_t slot_name[15];
+    union {
+        uint64_t slot_counter;
+        uint8_t slot_counter_s[8];
+        struct {
+            uint16_t slot_interval;
+            uint16_t __padding[3];
+        };
+    } __packed;
+} __packed write_to_slot_2_payload;
+
+typedef struct {
+    uint8_t _command_type;
+    uint8_t slot_number;
+    uint8_t slot_name[15];
+    uint8_t slot_secret[20];
+    union {
+        uint8_t _slot_config;
+        struct {
+            bool use_8_digits   : 1;
+            bool use_enter      : 1;
+            bool use_tokenID    : 1;
+        };
+    };
+    union {
+        uint8_t slot_token_id[13]; /** OATH Token Identifier */
+        struct { /** @see https://openauthentication.org/token-specs/ */
+            uint8_t omp[2];
+            uint8_t tt[2];
+            uint8_t mui[8];
+            uint8_t keyboard_layout; //disabled feature in nitroapp as of 20160805
+        } slot_token_fields;
+    };
+    union {
+        uint64_t slot_counter;
+        uint8_t slot_counter_s[8];
+    } __packed;
+} __packed OTP_slot_content;
+
+static const int CMD_WRITE_CONFIG_PASSWORD_OFFSET = 6;
+static const int CMD_ERASE_SLOT_PASSWORD_OFFSET = 2;