feat(nfc): Add single card pairing

Author: vrockz747

apps/inheritance_app/inheritance_auth_wallet.c

@@ -19,6 +19,7 @@
 
 #include "bip39.h"
 #include "card_fetch_data.h"
+#include "card_pair.h"
 #include "inheritance/core.pb.h"
 #include "inheritance_api.h"
 #include "inheritance_main.h"
@@ -28,7 +29,6 @@
 #include "status_api.h"
 #include "ui_core_confirm.h"
 #include "ui_screens.h"
-
 /*****************************************************************************
  * EXTERN VARIABLES
  *****************************************************************************/
@@ -123,6 +123,15 @@ static bool auth_wallet_get_entropy() {
   memcpy(msgs[0].plain_data, auth->wallet_id, WALLET_ID_SIZE);
 
   card_error_type_e status = card_fetch_encrypt_data(auth->wallet_id, msgs, 1);
+  // Pair the card first
+  if (CARD_OPERATION_UNPAIRED_CARD == status) {
+    card_error_type_e value =
+        single_card_pair_operation("Pair Card", "Tap to start");
+    if (value != CARD_OPERATION_SUCCESS) {
+      return false;
+    }
+    status = card_fetch_encrypt_data(auth->wallet_id, msgs, 1);
+  }
 
   delay_scr_init(ui_text_inheritance_wallet_authenticating, DELAY_SHORT);
 

common/flash/flash_config.h

@@ -26,7 +26,7 @@
   32    ///< Size of IO protection key (used for encrypted comm b/w MCU and
         ///< ATECC608A)
 #define ECDSA_PUB_KEY_SIZE 33        ///< Size of ECDSA (compressed) public key
-#define MAX_KEYSTORE_ENTRY 4         ///< Maximum number of keystore entries
+#define MAX_KEYSTORE_ENTRY 4 + 1     ///< Maximum number of keystore entries
 #define FS_KEYSTORE_KEYID_LEN 4      ///< Length of key id in keystore entry
 #define FS_KEYSTORE_KEYPATH_LEN 8    ///< Length of key path in keystore entry
 #define FS_KEYSTORE_PRIVKEY_LEN                                                \

src/card_operations/card_fetch_encrypt_data.c

@@ -128,6 +128,9 @@ card_error_type_e card_fetch_encrypt_data(uint8_t *wallet_id,
 #if USE_SIMULATOR == 0
     memcpy(card_data.nfc_data.family_id, get_family_id(), FAMILY_ID_SIZE);
     result = card_initialize_applet(&card_data);
+    if (true == card_data.nfc_data.pairing_error) {
+      result = CARD_OPERATION_UNPAIRED_CARD;
+    }
 #endif
 
     if (CARD_OPERATION_SUCCESS == card_data.error_type) {

src/card_operations/card_operation_typedefs.h

@@ -46,7 +46,8 @@ typedef enum card_errors_type {
                                      can be associated to @ref
                                      card_error_status_word_e errors or PN532
                                      errors */
-
+  CARD_OPERATION_UNPAIRED_CARD,   /** Error indicating failed operation due to
+                                      card not being paired*/
   CARD_OPERATION_DEFAULT_INVALID = 0xFF, /** Default invalid value */
 } card_error_type_e;
 

src/card_operations/card_pair.c

@@ -484,6 +484,58 @@ card_error_type_e card_pair_operation(uint8_t card_number,
     break;
   }
 
+  nfc_deselect_card();
+  return card_data.error_type;
+}
+
+card_error_type_e single_card_pair_operation(char *heading,
+                                             const char *message) {
+  // Need to handle how assign new card its number
+  card_operation_data_t card_data = {0};
+  card_pairing_data_t pair_data = {0};
+
+  if (SUCCESS != pair_card_preprocess(&pair_data)) {
+    return CARD_OPERATION_ABORT_OPERATION;
+  }
+
+  instruction_scr_init(message, heading);
+  card_data.nfc_data.retries = 5;
+
+  while (1) {
+    // Initialize card tap config
+    card_data.nfc_data.acceptable_cards = ACCEPTABLE_CARDS_ALL;
+
+    init_and_pair_card(&card_data, &pair_data);
+
+    if (CARD_OPERATION_SUCCESS == card_data.error_type) {
+      if (SW_NO_ERROR != handle_pairing_success(&card_data, &pair_data)) {
+        card_data.error_type = CARD_OPERATION_ABORT_OPERATION;
+        break;
+      }
+
+      buzzer_start(BUZZER_DURATION);
+      // if (4 != card_number) {
+      //   wait_for_card_removal();
+      // }
+      // since we are pairing only one card
+      wait_for_card_removal();
+
+      break;
+    }
+
+    if (CARD_OPERATION_CARD_REMOVED == card_data.error_type ||
+        CARD_OPERATION_RETAP_BY_USER_REQUIRED == card_data.error_type) {
+      const char *error_msg = card_data.error_message;
+      if (CARD_OPERATION_SUCCESS == indicate_card_error(error_msg)) {
+        // Re-render the instruction screen
+        instruction_scr_init(message, heading);
+        continue;
+      }
+    }
+
+    break;
+  }
+
   nfc_deselect_card();
   return card_data.error_type;
 }

src/card_operations/card_pair.h

@@ -62,4 +62,10 @@ card_error_type_e card_pair_without_retap(uint8_t card_number,
 card_error_type_e card_pair_operation(uint8_t card_number,
                                       char *heading,
                                       const char *message);
+// To Improvise:
+// Single card pairing operation,
+// Should allow single or extra card to be paired if not already,
+// for any required flow
+card_error_type_e single_card_pair_operation(char *heading,
+                                             const char *message);
 #endif