Merge branch 'pr/106'

Author: benma

.gitattributes

@@ -1,2 +1,2 @@
-/py/bitbox02/generated linguist-generated=true
-/py/bitbox02u2f/generated linguist-generated=true
+/py/bitbox02/generated/* linguist-generated=true
+/py/bitbox02u2f/generated/* linguist-generated=true

messages/hww.proto

@@ -62,6 +62,8 @@ message CreateBackupRequest {
 
 message RestoreBackupRequest {
   string id = 1;
+  uint32 timestamp = 2;
+  int32 timezone_offset = 3;
 }
 
 message ListBackupsRequest {
@@ -129,7 +131,7 @@ message PubResponse {
 message BackupInfo {
   string id = 1;
   uint32 timestamp = 2;
-  uint32 timezone_offset = 3;
+  // uint32 timezone_offset = 3;
   string name = 4;
 }
 
@@ -257,7 +259,10 @@ message ETHResponse {
 
 message ResetRequest {}
 
-message RestoreFromMnemonicRequest {}
+message RestoreFromMnemonicRequest {
+  uint32 timestamp = 1;
+  int32 timezone_offset = 2;
+}
 
 message Request {
     oneof request {

py/bitbox02/bitbox02.py

@@ -349,6 +349,8 @@ def restore_backup(self, backup_id: str) -> bool:
         # pylint: disable=no-member
         request = hww.Request()
         request.restore_backup.id = backup_id
+        request.restore_backup.timestamp = int(time.time())
+        request.restore_backup.timezone_offset = time.localtime().tm_gmtoff
         try:
             self._msg_query(request, expected_response="success")
         except Bitbox02Exception as err:
@@ -695,7 +697,11 @@ def restore_from_mnemonic(self) -> bool:
         """
         request = hww.Request()
         # pylint: disable=no-member
-        request.restore_from_mnemonic.CopyFrom(hww.RestoreFromMnemonicRequest())
+        request.restore_from_mnemonic.CopyFrom(
+            hww.RestoreFromMnemonicRequest(
+                timestamp=int(time.time()), timezone_offset=time.localtime().tm_gmtoff
+            )
+        )
         try:
             self._msg_query(request)
         except Bitbox02Exception as err:

py/bitbox02/generated/hww_pb2.py

@@ -24,8 +24,6 @@ set(DBB-FIRMWARE-SOURCES
   ${CMAKE_SOURCE_DIR}/src/util.c
   ${CMAKE_SOURCE_DIR}/src/sd.c
   ${CMAKE_SOURCE_DIR}/src/hww.c
-  ${CMAKE_SOURCE_DIR}/src/u2f.c
-  ${CMAKE_SOURCE_DIR}/src/u2f/u2f_app.c
   ${CMAKE_SOURCE_DIR}/src/memory.c
   ${CMAKE_SOURCE_DIR}/src/salt.c
   ${CMAKE_SOURCE_DIR}/src/i2c_ecc.c
@@ -40,6 +38,7 @@ set(DBB-FIRMWARE-SOURCES
   ${CMAKE_SOURCE_DIR}/src/workflow/workflow.c
   ${CMAKE_SOURCE_DIR}/src/workflow/trinary_input.c
   ${CMAKE_SOURCE_DIR}/src/workflow/confirm.c
+  ${CMAKE_SOURCE_DIR}/src/workflow/confirm_time.c
   ${CMAKE_SOURCE_DIR}/src/workflow/status.c
   ${CMAKE_SOURCE_DIR}/src/workflow/password.c
   ${CMAKE_SOURCE_DIR}/src/workflow/password_enter.c
@@ -290,6 +289,12 @@ set_source_files_properties(
   COMPILE_FLAGS "-Wno-switch-default"
 )
 
+set(FIRMWARE-U2F-SOURCES
+  ${CMAKE_SOURCE_DIR}/src/u2f.c
+  ${CMAKE_SOURCE_DIR}/src/u2f/u2f_app.c
+)
+set(FIRMWARE-U2F-SOURCES ${FIRMWARE-U2F-SOURCES} PARENT_SCOPE)
+
 #-----------------------------------------------------------------------------
 # Include directories
 
@@ -502,8 +507,10 @@ if(CMAKE_CROSSCOMPILING)
 
   target_sources(firmware.elf PRIVATE firmware.c)
   target_compile_definitions(firmware.elf PRIVATE APP_BTC APP_LTC APP_ETH APP_U2F)
+  target_sources(firmware.elf PRIVATE ${FIRMWARE-U2F-SOURCES})
 
   target_sources(firmware-semihosting.elf PRIVATE firmware.c)
+  target_sources(firmware-semihosting.elf PRIVATE ${FIRMWARE-U2F-SOURCES})
   # Select an implementation of the system calls that can communicate with the debugger
   target_compile_options(firmware-semihosting.elf PRIVATE --specs=rdimon.specs)
   target_link_libraries(firmware-semihosting.elf PRIVATE --specs=rdimon.specs)

py/bitbox02/generated/hww_pb2.pyi

@@ -219,9 +219,9 @@ static commander_error_t _api_reset(void)
     return COMMANDER_OK;
 }
 
-static commander_error_t _api_restore_from_mnemonic(void)
+static commander_error_t _api_restore_from_mnemonic(const RestoreFromMnemonicRequest* request)
 {
-    if (!workflow_restore_from_mnemonic()) {
+    if (!workflow_restore_from_mnemonic(request)) {
         return COMMANDER_ERR_GENERIC;
     }
     return COMMANDER_OK;
@@ -317,7 +317,7 @@ static commander_error_t _api_process(const Request* request, Response* response
         return _api_reset();
     case Request_restore_from_mnemonic_tag:
         response->which_response = Response_success_tag;
-        return _api_restore_from_mnemonic();
+        return _api_restore_from_mnemonic(&(request->request.restore_from_mnemonic));
     default:
         screen_print_debug("command unknown", 1000);
         return COMMANDER_ERR_INVALID_INPUT;

py/bitbox02u2f/generated/hww_pb2.py

@@ -660,6 +660,7 @@ bool securechip_ecc_unsafe_sign(const uint8_t* priv_key, const uint8_t* msg, uin
     return true;
 }
 
+#if defined(APP_U2F) || defined(FACTORYSETUP)
 // Read a "standard" sized block from a data slot (must be 32 bytes)
 static ATCA_STATUS _read_data_slot_block(uint8_t* bytes, uint16_t slot, uint8_t block)
 {
@@ -688,23 +689,25 @@ static ATCA_STATUS _write_data_slot_block(uint8_t* bytes, uint16_t slot, uint8_t
     return atcab_write_enc(slot, block, bytes, encryption_key, SECURECHIP_SLOT_ENCRYPTION_KEY);
 }
 
-bool securechip_u2f_counter_set(uint32_t value)
+bool securechip_u2f_counter_set(uint32_t counter)
 {
     data_9_0_t data = {0};
     ATCA_STATUS result = _read_data_slot_block(&data.bytes, SECURECHIP_SLOT_DATA0, 0);
     if (result != ATCA_SUCCESS) {
         return false;
     }
 
-    data.fields.u2f_counter = value;
+    data.fields.u2f_counter = counter;
 
     result = _write_data_slot_block(&data.bytes, SECURECHIP_SLOT_DATA0, 0);
     if (result != ATCA_SUCCESS) {
         return false;
     }
     return true;
 }
+#endif
 
+#if defined(APP_U2F)
 bool securechip_u2f_counter_inc(uint32_t* counter)
 {
     data_9_0_t data = {0};
@@ -722,3 +725,4 @@ bool securechip_u2f_counter_inc(uint32_t* counter)
     }
     return true;
 }
+#endif