Bixin dev：check pin before device verify (#109)

* Revert "feat:Supports passphrase entry at the device"

* feat:check pin before device verify

Author: lihuanhuan

legacy/firmware/config.c

@@ -710,11 +710,9 @@ const uint8_t *config_getSeed(void) {
   char mnemonic[MAX_MNEMONIC_LEN + 1] = {0};
   if (config_getMnemonic(mnemonic, sizeof(mnemonic))) {
     char passphrase[MAX_PASSPHRASE_LEN + 1] = {0};
-    if (!protectPassphraseOnDevice(passphrase)) {
+    if (!protectPassphrase(passphrase)) {
       memzero(mnemonic, sizeof(mnemonic));
       memzero(passphrase, sizeof(passphrase));
-      fsm_sendFailure(FailureType_Failure_ActionCancelled,
-                      _("Passphrase dismissed"));
       return NULL;
     }
     // passphrase is used - confirm on the display

legacy/firmware/fsm_msg_common.h

@@ -779,6 +779,8 @@ void fsm_msgBixinMessageSE(const BixinMessageSE *msg) {
 }
 
 void fsm_msgBixinVerifyDeviceRequest(const BixinVerifyDeviceRequest *msg) {
+  CHECK_PIN
+
   layoutDialogSwipe(NULL, _("Cancel"), _("Confirm"), _("SECURITY CHECK"), NULL,
                     _("Check this device with\nOneKey secure server?"), NULL,
                     NULL, NULL, NULL);

legacy/firmware/language.c

@@ -231,12 +231,6 @@ const char *languages[][2] = {
     // fsm_msg_common.h fsm_msg_common.h fsm_msg_common.h
     // fsm_msg_common.h fsm_msg_common.h fsm_msg_common.h
     {"Do you really want to", "请确认"},
-    //
-    {"Do you really want to \ndisable passphrase protection?",
-     "要禁用passphrase加密吗?"},
-    //
-    {"Do you really want to \nenable passphrase protection?",
-     "要启用passphrase加密吗?"},
     // fsm_msg_common.h
     {"Do you want to", "请确认"},
     // layout2.c
@@ -268,11 +262,7 @@ const char *languages[][2] = {
     // layout2.c layout2.c
     {"English", "简体中文"},
     //
-    {"Enter", "填入"},
-    //
     {"Enter PIN to unlock", "输入PIN码解锁"},
-    //
-    {"Enter Passphrase", "输入Passphrase"},
     // protect.c
     {"Enter new wipe code:", "输入新的擦除PIN码"},
     //
@@ -557,8 +547,6 @@ const char *languages[][2] = {
     {"Public Key:", "公钥"},
     // layout2.c
     {"QR Code", "二维码"},
-    //
-    {"Quit", "退出"},
     // layout2.c
     {"Quota:", "单次限额"},
     {"REJECT", "拒绝"},
@@ -654,10 +642,6 @@ const char *languages[][2] = {
     {"Starting up", "启动中"},
     // config.c
     {"Storage failure", ""},
-    //
-    {"Submit", "提交"},
-    //
-    {"Switch", "切换"},
     // protect.c
     {"The new PIN must be different from your wipe code.", ""},
     // recovery.c

legacy/firmware/layout2.c

@@ -1387,7 +1387,7 @@ void layoutShowPassphrase(const char *passphrase) {
   const char **str =
       split_message((const uint8_t *)passphrase, strlen(passphrase), 21);
   for (int i = 0; i < 3; i++) {
-    oledDrawString(0, (i + 1) * 9, str[i], FONT_FIXED);
+    oledDrawString(0, i * 9 + 4, str[i], FONT_FIXED);
   }
   oledDrawStringCenterAdapter(OLED_WIDTH / 2, OLED_HEIGHT - 2 * 9 - 1,
                               _("Use this passphrase?"), FONT_STANDARD);
@@ -1999,40 +1999,28 @@ void layoutProgressAdapter(const char *desc, int permil) {
 }
 
 void _layout_iterm_select(int x, int y, const BITMAP *bmp, const char *text,
-                          uint8_t font, bool vert) {
+                          uint8_t font) {
   int l = 0;
   int y0 = font & FONT_DOUBLE ? 8 : 0;
   oledBox(x - 4, y - 8, x + 4, y + 16 + y0, false);
-  oledDrawBitmap(x - 4, y - 10, &bmp_btn_up);
+  oledDrawBitmap(x - 4, y - 8, &bmp_btn_up);
   l = oledStringWidth(text, font);
   if (bmp) {
     oledDrawBitmap(x - 4, y + 1, bmp);
   } else {
     oledDrawStringAdapter(x - l / 2, y, text, font);
-    if (vert) {
-      oledInvert(x - l / 2 - 1, y - 1, x + l / 2, y + 8);
-      oledClearPixel(x - l / 2 - 1, y - 1);
-      oledClearPixel(x - l / 2 - 1, y + 8);
-      oledClearPixel(x + l / 2, y - 1);
-      oledClearPixel(x + l / 2, y + 8);
-    }
   }
 
-  oledDrawBitmap(x - 4, y + 11 + y0, &bmp_btn_down);
+  oledDrawBitmap(x - 4, y + 10 + y0, &bmp_btn_down);
   oledRefresh();
 }
 
 void layoutItemsSelect(int x, int y, const char *text, uint8_t font) {
-  _layout_iterm_select(x, y, NULL, text, font, false);
-}
-
-void layoutItemsSelect_ex(int x, int y, const char *text, uint8_t font,
-                          bool vert) {
-  _layout_iterm_select(x, y, NULL, text, font, vert);
+  _layout_iterm_select(x, y, NULL, text, font);
 }
 
 void layoutBmpSelect(int x, int y, const BITMAP *bmp) {
-  _layout_iterm_select(x, y, bmp, NULL, FONT_STANDARD, false);
+  _layout_iterm_select(x, y, bmp, NULL, FONT_STANDARD);
 }
 
 void layoutInputPin(uint8_t pos, const char *text, int index,
@@ -2099,98 +2087,6 @@ void layoutInputWord(const char *text, uint8_t prefix_len, const char *prefix,
 
   oledRefresh();
 }
-static char *input[4] = {"abc", "ABC", "123", "=/<"};
-static char *input1[4] = {"ab", "AB", "01", "=<"};
-
-void layoutInputMethod(uint8_t index) {
-  layoutItemsSelectAdapter(&bmp_btn_up, &bmp_btn_down, NULL, &bmp_btn_confirm,
-                           NULL, _("OK"), index + 1, 4, NULL, NULL,
-                           input[index], index > 0 ? input[index - 1] : NULL,
-                           index < 3 ? input[index + 1] : NULL);
-}
-
-void layoutInputPassphrase(const char *text, uint8_t prefix_len,
-                           const char *prefix, uint8_t char_index,
-                           uint8_t input_type) {
-  int l, y = 10;
-  char word_show[9] = "_________";
-  char buf[2] = {0};
-  char index_str[16] = "";
-  uint8_t location = 0;
-
-  int x = 6, icon_x = 80;
-
-  if (prefix_len < 9) {
-    memcpy(word_show, prefix, prefix_len);
-  } else {
-    memcpy(word_show, prefix + prefix_len - 8, 8);
-  }
-
-  oledClear_ex();
-
-  // index
-  uint2str(prefix_len + 1, index_str);
-  strcat(index_str + strlen(index_str), "/");
-  uint2str(50, index_str + strlen(index_str));
-  oledDrawStringAdapter(1, 1, index_str, FONT_SMALL);
-
-  // input type
-  oledDrawString(icon_x, 1, input[input_type], FONT_SMALL);
-
-  l = oledStringWidth(input[input_type], FONT_SMALL);
-
-  oledInvert(icon_x - 2, 0, icon_x + l, 6);
-  oledClearPixel(icon_x - 2, 0);
-  oledClearPixel(icon_x - 2, 6);
-  oledClearPixel(icon_x + l, 0);
-  oledClearPixel(icon_x + l, 6);
-  oledRefresh();
-
-  // title
-  oledDrawStringCenterAdapter(OLED_WIDTH / 2, y, text, FONT_STANDARD);
-
-  y += 18;
-  if (prefix_len < 9) {
-    for (uint32_t i = 0; i < sizeof(word_show); i++) {
-      buf[0] = word_show[i];
-      l = oledStringWidth(buf, FONT_STANDARD);
-      oledDrawStringAdapter(x + 13 * i + 7 - l / 2, y, buf, FONT_STANDARD);
-    }
-  } else {
-    oledDrawStringAdapter(0, y, "..", FONT_STANDARD);
-    for (uint32_t i = 0; i < sizeof(word_show); i++) {
-      buf[0] = word_show[i];
-      l = oledStringWidth(buf, FONT_STANDARD);
-      oledDrawStringAdapter(x + 13 * i + 7 - l / 2, y, buf, FONT_STANDARD);
-    }
-  }
-
-  location = prefix_len > 8 ? 8 : prefix_len;
-  if (char_index == 0) {
-    layoutItemsSelect_ex(x + 13 * location + 7, y, input1[input_type],
-                         FONT_STANDARD, true);
-    layoutButtonYesAdapter(_("Switch"), &bmp_btn_switch);
-  } else if (char_index == 0xFF) {
-    layoutBmpSelect(x + 13 * location + 7, y, &bmp_btn_confirm);
-    layoutButtonYesAdapter(_("Submit"), &bmp_btn_confirm);
-  } else {
-    buf[0] = char_index;
-    layoutItemsSelect_ex(x + 13 * location + 7, y, buf, FONT_STANDARD, false);
-    if (prefix_len == (MAX_PASSPHRASE_LEN - 1)) {
-      layoutButtonYesAdapter(_("Submit"), &bmp_btn_confirm);
-    } else {
-      layoutButtonYesAdapter(_("Enter"), &bmp_btn_confirm);
-    }
-  }
-
-  if (prefix_len == 0) {
-    layoutButtonNoAdapter(_("Quit"), &bmp_btn_back);
-  } else {
-    layoutButtonNoAdapter(_("Back"), &bmp_btn_back);
-  }
-
-  oledRefresh();
-}
 
 void layoutItemsSelectAdapter(const BITMAP *bmp_up, const BITMAP *bmp_down,
                               const BITMAP *bmp_no, const BITMAP *bmp_yes,
@@ -2244,11 +2140,11 @@ void layoutItemsSelectAdapter(const BITMAP *bmp_up, const BITMAP *bmp_down,
     oledDrawStringCenterAdapter(OLED_WIDTH / 2, y1, current, FONT_STANDARD);
   }
 
-  oledInvert(x - 2, y1 - 1, x + l + 1, y1 + cur_font->pixel);
-  oledClearPixel(x - 2, y1 - 1);
-  oledClearPixel(x - 2, y1 + cur_font->pixel);
-  oledClearPixel(x + l + 1, y1 - 1);
-  oledClearPixel(x + l + 1, y1 + cur_font->pixel);
+  oledInvert(x - 3, y1 - 1, x + l + 2, y1 + cur_font->pixel);
+  oledClearPixel(x - 3, y1 - 1);
+  oledClearPixel(x - 3, y1 + cur_font->pixel);
+  oledClearPixel(x + l + 2, y1 - 1);
+  oledClearPixel(x + l + 2, y1 + cur_font->pixel);
 
   if (next) {
     oledDrawStringCenterAdapter(OLED_WIDTH / 2, y1 + cur_font->pixel + step,

legacy/firmware/layout2.h

@@ -152,9 +152,6 @@ void layoutDialogSwipeCenterAdapter(const BITMAP *icon, const BITMAP *bmp_no,
                                     const char *line5, const char *line6);
 
 void layoutItemsSelect(int x, int y, const char *text, uint8_t font);
-void layoutItemsSelect_ex(int x, int y, const char *text, uint8_t font,
-                          bool vert);
-
 void layoutBmpSelect(int x, int y, const BITMAP *bmp);
 void layoutItemsSelectAdapter(const BITMAP *bmp_up, const BITMAP *bmp_down,
                               const BITMAP *bmp_no, const BITMAP *bmp_yes,
@@ -169,11 +166,6 @@ void layoutInputPin(uint8_t pos, const char *text, int index,
 void layoutInputWord(const char *text, uint8_t prefix_len, const char *prefix,
                      const char *letter);
 
-void layoutInputMethod(uint8_t index);
-void layoutInputPassphrase(const char *text, uint8_t prefix_len,
-                           const char *prefix, uint8_t char_index,
-                           uint8_t input_type);
-
 void layoutDeviceParameters(int num);
 void layoutEnterSleep(void);
 

legacy/firmware/menu_list.c

@@ -314,31 +314,6 @@ void menu_blindSign(int index) {
   }
 }
 
-void menu_set_passphrase(int index) {
-  (void)index;
-
-  uint8_t key = KEY_NULL;
-
-  if (index) {
-    layoutDialogAdapter_ex(
-        NULL, &bmp_btn_back, _("Cancel"), &bmp_btn_forward, _("Confirm"), NULL,
-        NULL, _("Do you really want to \ndisable passphrase protection?"), NULL,
-        NULL, NULL, NULL);
-  } else {
-    layoutDialogAdapter_ex(
-        NULL, &bmp_btn_back, _("Cancel"), &bmp_btn_forward, _("Confirm"), NULL,
-        NULL, _("Do you really want to \nenable passphrase protection?"), NULL,
-        NULL, NULL, NULL);
-  }
-
-  key = protectWaitKey(0, 1);
-  if (key != KEY_CONFIRM) {
-    return;
-  }
-
-  config_setPassphraseProtection(index ? false : true);
-}
-
 static struct menu_item ble_set_menu_items[] = {
     {"On", NULL, true, menu_para_set_ble, NULL, true},
     {"Off", NULL, true, menu_para_set_ble, NULL, true}};
@@ -397,19 +372,6 @@ static struct menu shutdown_set_menu = {
     .previous = &settings_menu,
 };
 
-static struct menu_item passphrase_set_menu_items[] = {
-    {"On", NULL, true, menu_set_passphrase, NULL, true},
-    {"Off", NULL, true, menu_set_passphrase, NULL, true}};
-
-static struct menu passphrase_set_menu = {
-    .start = 0,
-    .current = 0,
-    .counts = COUNT_OF(passphrase_set_menu_items),
-    .title = NULL,
-    .items = passphrase_set_menu_items,
-    .previous = &security_set_menu,
-};
-
 static struct menu_item settings_menu_items[] = {
     {"Bluetooth", NULL, false, .sub_menu = &ble_set_menu, menu_para_ble_state,
      false},
@@ -432,8 +394,6 @@ static struct menu settings_menu = {
 static struct menu_item security_set_menu_items[] = {
     {"Change PIN", NULL, true, menu_changePin, NULL, false},
     {"Blind Signing", NULL, true, menu_blindSign, NULL, false},
-    {"Passphrase", NULL, false, .sub_menu = &passphrase_set_menu,
-     menu_para_passphrase, true},
     {"Reset", NULL, true, menu_erase_device, NULL, false},
     //{"Check Mnemonic", NULL, true, menu_showMnemonic, NULL}
 };

legacy/firmware/menu_para.c

@@ -56,12 +56,6 @@ char* menu_para_sol_switch(void) {
   return config_getCoinSwitch(COIN_SWITCH_SOLANA) ? _(" On") : _(" Off");
 };
 
-char* menu_para_passphrase(void) {
-  bool passphrase_protection = false;
-  config_getPassphraseProtection(&passphrase_protection);
-  return passphrase_protection ? _(" On") : _(" Off");
-};
-
 void menu_para_set_ble(int index) {
   bool ble_state = index ? false : true;
   if (ble_state != ble_get_switch()) {

legacy/firmware/menu_para.h

@@ -7,7 +7,6 @@ char* menu_para_shutdown(void);
 char* menu_para_autolock(void);
 char* menu_para_eth_eip_switch(void);
 char* menu_para_sol_switch(void);
-char* menu_para_passphrase(void);
 
 void menu_para_set_ble(int index);
 void menu_para_set_language(int index);