feat(legacy): enable USB HID in bitcoin-only firmware for factory mode (#187)

* feat(legacy): enable FIDO2/U2F in bitcoin-only firmware for factory mode

* chore(legacy): bump firmware version to 3.17.2.

Author: lihuanhuan

legacy/Makefile.include

@@ -171,12 +171,13 @@ endif
 
 ifeq ($(BITCOIN_ONLY), 1)
 CFLAGS += -DBITCOIN_ONLY=1
-CFLAGS += -DU2F_ENABLED=0
 else
 CFLAGS += -DBITCOIN_ONLY=0
-CFLAGS += -DU2F_ENABLED=1
 endif
 
+# U2F_ENABLED always enabled to support factory mode
+CFLAGS += -DU2F_ENABLED=1
+
 ifeq ($(PRODUCTION), 0)
 CFLAGS   += -DPRODUCTION=0
 CPUFLAGS += -DPRODUCTION=0

legacy/firmware/Makefile

@@ -91,11 +91,13 @@ OBJS += se_chip.o
 OBJS += psbt/psbt.o
 OBJS += bip322_simple/bip322_simple.o
 
-ifneq ($(BITCOIN_ONLY),1)
+# FIDO2 support (always compiled for factory mode)
 OBJS += fido2/ctap_trans.o
 OBJS += fido2/ctap.o
 OBJS += fido2/ctap_parse.o
 OBJS += fido2/resident_credential.o
+
+ifneq ($(BITCOIN_ONLY),1)
 OBJS += ethereum.o
 OBJS += ethereum_definitions.o
 OBJS += ethereum_networks.o

legacy/firmware/usb.c

@@ -97,6 +97,8 @@ uint16_t s_usOffset;
 static const char *usb_strings[] = {USB_STRINGS};
 #undef X
 
+static bool usb_fido_switch = true;
+
 static struct usb_device_descriptor dev_descr = {
     .bLength = USB_DT_DEVICE_SIZE,
     .bDescriptorType = USB_DT_DEVICE,
@@ -277,9 +279,17 @@ static struct usb_config_descriptor config = {
 };
 
 static void usb_init_ifaces(void) {
-  bool fido_switch = true;
-  config_getFidoSwitch(&fido_switch);
+#if BITCOIN_ONLY
 
+  if (se_isFactoryMode()) {
+    usb_fido_switch = true;
+  } else {
+    usb_fido_switch = false;
+  }
+
+#else
+  config_getFidoSwitch(&usb_fido_switch);
+#endif
   int idx = 0;
   ifaces[idx].num_altsetting = 1;
   ifaces[idx].altsetting = webusb_iface_main;
@@ -292,7 +302,7 @@ static void usb_init_ifaces(void) {
 #endif
 
 #if U2F_ENABLED
-  if (fido_switch) {
+  if (usb_fido_switch) {
     ifaces[idx].num_altsetting = 1;
     ifaces[idx].altsetting = hid_iface_u2f;
     idx++;
@@ -394,9 +404,7 @@ static void set_config(usbd_device *dev, uint16_t wValue) {
                 USB_PACKET_SIZE, main_rx_callback);
 #if U2F_ENABLED
 
-  bool fido_switch = false;
-  config_getFidoSwitch(&fido_switch);
-  if (fido_switch) {
+  if (usb_fido_switch) {
     usbd_ep_setup(dev, ENDPOINT_ADDRESS_U2F_IN, USB_ENDPOINT_ATTR_INTERRUPT,
                   USB_PACKET_SIZE, 0);
     usbd_ep_setup(dev, ENDPOINT_ADDRESS_U2F_OUT, USB_ENDPOINT_ATTR_INTERRUPT,
@@ -410,7 +418,7 @@ static void set_config(usbd_device *dev, uint16_t wValue) {
                 USB_PACKET_SIZE, debug_rx_callback);
 #endif
 #if U2F_ENABLED
-  if (fido_switch) {
+  if (usb_fido_switch) {
     usbd_register_control_callback(
         dev, USB_REQ_TYPE_STANDARD | USB_REQ_TYPE_INTERFACE,
         USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT, hid_control_request);
@@ -594,7 +602,6 @@ void usbPoll(void) {
 #endif
 }
 
-#if !BITCOIN_ONLY
 void usb_u2f_data_send(void) {
   static const uint8_t *data;
   while (1) {
@@ -608,7 +615,7 @@ void usb_u2f_data_send(void) {
     }
   }
 }
-#endif
+
 void usbReconnect(void) {
   if (usbd_dev != NULL) {
     usbd_disconnect(usbd_dev, 1);

legacy/firmware/version.h

@@ -8,9 +8,9 @@
 
 #define ONEKEY_VER_MAJOR 3
 #define ONEKEY_VER_MINOR 17
-#define ONEKEY_VER_PATCH 1
+#define ONEKEY_VER_PATCH 2
 
-#define ONEKEY_VERSION "3.17.1"
+#define ONEKEY_VERSION "3.17.2"
 // Deprecated
 #define ONEKEY_VERSION_HEX 0x3F00
 

legacy/script/cibuild

@@ -7,9 +7,7 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-if [ "$BITCOIN_ONLY" != 1 ]; then
-    vendor/trezor-common/tools/cointool.py render firmware/fido2
-fi
+vendor/trezor-common/tools/cointool.py render firmware/fido2
 
 if [ "$EMULATOR" = 1 ]; then
     make -C emulator