fix(app): Auth wallet nfc updates

Author: vrockz747

apps/inheritance_app/inheritance_auth_wallet.c

@@ -37,7 +37,7 @@
  *****************************************************************************/
 #define CHALLENGE_SIZE_MAX 32
 #define CHALLENGE_SIZE_MIN 16
-#define ENTROPY_SIZE_LIMIT 100    // TODO:CONFIRM
+#define ENTROPY_SIZE_LIMIT 100
 
 /*****************************************************************************
  * PRIVATE TYPEDEFS
@@ -137,11 +137,14 @@ static bool auth_wallet_get_signature();
  *****************************************************************************/
 
 static bool verify_auth_wallet_inputs() {
-  ASSERT(auth->challenge != 0);
-  ASSERT(auth->wallet_id != 0);
-  ASSERT(auth->challenge_size != 0);
-  ASSERT(CHALLENGE_SIZE_MIN <= auth->challenge_size &&
-         auth->challenge_size <= CHALLENGE_SIZE_MAX);
+  if (NULL == auth->challenge || NULL == auth->wallet_id ||
+      auth->challenge_size ||
+      (CHALLENGE_SIZE_MIN <= auth->challenge_size &&
+       auth->challenge_size <= CHALLENGE_SIZE_MAX)) {
+    inheritance_send_error(ERROR_COMMON_ERROR_CORRUPT_DATA_TAG,
+                           ERROR_DATA_FLOW_INVALID_QUERY);
+    return false;
+  }
 
   return true;
 }
@@ -216,22 +219,19 @@ void inheritance_wallet_login(inheritance_query_t *query) {
   auth->is_setup = query->auth_wallet.initiate.is_public_key;
 
   set_app_flow_status(INHERITANCE_AUTH_WALLET_STATUS_INIT);
-  if (!verify_auth_wallet_inputs(auth) || !auth_wallet_get_entropy(auth) ||
-      !auth_wallet_get_pairs(auth) || !auth_wallet_get_signature(auth)) {
+  if (!verify_auth_wallet_inputs() || !auth_wallet_get_entropy() ||
+      !auth_wallet_get_pairs() || !auth_wallet_get_signature()) {
     inheritance_send_error(ERROR_COMMON_ERROR_CORRUPT_DATA_TAG,
                            ERROR_DATA_FLOW_INVALID_DATA);
-    // Set App flow status
     delay_scr_init(ui_text_inheritance_wallet_auth_fail, DELAY_TIME);
     return;
   }
-  // Set App flow status
   delay_scr_init(ui_text_inheritance_wallet_auth_success, DELAY_TIME);
 
   inheritance_result_t result = INHERITANCE_RESULT_INIT_ZERO;
   result.which_response = INHERITANCE_RESULT_AUTH_WALLET_TAG;
   result.auth_wallet.which_response =
       INHERITANCE_AUTH_WALLET_RESPONSE_RESULT_TAG;
-  // send public key if Setup
   memcpy(result.auth_wallet.result.signature,
          auth->signature,
          sizeof(ed25519_signature));

common/interfaces/card_interface/apdu.c

@@ -428,7 +428,6 @@ uint16_t create_apdu_inheritance(const uint8_t name[NAME_SIZE],
   ASSERT(data != NULL);
   ASSERT(apdu != NULL);
   ASSERT(data_size != 0);
-  ASSERT(operation != 0);
 
   apdu[OFFSET_CLA] = CLA_ISO7816;
   apdu[OFFSET_INS] = APDU_INHERITANCE;

common/interfaces/card_interface/nfc.c

@@ -545,9 +545,10 @@ ISO7816 nfc_encrypt_data(const uint8_t name[NAME_SIZE],
                          uint16_t *encrypted_data_size) {
   ASSERT(name != NULL);
   ASSERT(plain_data != NULL);
+  ASSERT(plain_data_size != 0);
   ASSERT(encrypted_data != NULL);
-  ASSERT(encrypted_data_size != NULL);
 
+#if USE_SIMULATOR == 0
   ISO7816 status_word = CLA_ISO7816;
   uint8_t send_apdu[600] = {0}, *recv_apdu = send_apdu;
   uint16_t send_len = 0, recv_len = 236;
@@ -562,6 +563,9 @@ ISO7816 nfc_encrypt_data(const uint8_t name[NAME_SIZE],
   uint32_t system_clock = uwTick;
   ret_code_t err_code =
       nfc_exchange_apdu(send_apdu, send_len, recv_apdu, &recv_len);
+
+  uint8_t tmp[236];
+  memcpy(tmp, recv_apdu, 236);
   LOG_SWV("Encrypt data in %lums\n", uwTick - system_clock);
 
   if (err_code != STM_SUCCESS) {
@@ -572,13 +576,19 @@ ISO7816 nfc_encrypt_data(const uint8_t name[NAME_SIZE],
 
     if (status_word == SW_NO_ERROR) {
       // Extracting Data from APDU
-      *encrypted_data_size = recv_apdu[1];
-      memcpy(encrypted_data, recv_apdu + 2, recv_apdu[1]);
+      *encrypted_data_size = recv_len - 5;
+      memcpy(encrypted_data, recv_apdu + 3, recv_len - 5);
     }
   }
-
   memzero(recv_apdu, sizeof(send_apdu));
   return status_word;
+#else
+  // TODO: Standardize simulator/test wallet info
+  memcpy(name, "FIRST", 5);
+  memcpy(encrypted_data, name, 1);
+  memcpy(encrypted_data + 1, plain_data, plain_data_size);
+  *encrypted_data_size = 1 + plain_data_size;
+#endif
 }
 
 ISO7816 nfc_decrypt_data(const uint8_t name[NAME_SIZE],
@@ -605,6 +615,9 @@ ISO7816 nfc_decrypt_data(const uint8_t name[NAME_SIZE],
   uint32_t system_clock = uwTick;
   ret_code_t err_code =
       nfc_exchange_apdu(send_apdu, send_len, recv_apdu, &recv_len);
+
+  uint8_t tmp[236];
+  memcpy(tmp, recv_apdu, 236);
   LOG_SWV("Decrypt data in %lums\n", uwTick - system_clock);
   if (err_code != STM_SUCCESS) {
     return err_code;
@@ -614,8 +627,8 @@ ISO7816 nfc_decrypt_data(const uint8_t name[NAME_SIZE],
 
     if (status_word == SW_NO_ERROR) {
       // Extracting Data from APDU
-      *plain_data_size = recv_apdu[1];
-      memcpy(plain_data, recv_apdu + 2, recv_apdu[1]);
+      *plain_data_size = recv_len - 5;
+      memcpy(plain_data, recv_apdu + 3, recv_len - 5);
     }
   }
 

src/card_operations/card_fetch_encrypt_data.c

@@ -153,12 +153,6 @@ card_error_type_e card_fetch_encrypt_data(uint8_t *wallet_id,
                                encrypted_data_buffer,
                                &encrypted_data_buffer_size);
 #else
-          memcpy(wallet_name, "FIRST", 5);
-          dummy_nfc_encrypt_data(wallet_name,
-                                 plain_data_buffer,
-                                 plain_data_buffer_size,
-                                 encrypted_data_buffer,
-                                 &encrypted_data_buffer_size);
           card_data.nfc_data.status = SW_NO_ERROR;
           result = CARD_OPERATION_SUCCESS;
 #endif
@@ -209,4 +203,4 @@ card_error_type_e card_fetch_encrypt_data(uint8_t *wallet_id,
   nfc_deselect_card();
 #endif
   return result;
-}
+}