Merge branch 'usb-manufacturer'

Author: Beerosagos

CHANGELOG.md

@@ -7,6 +7,7 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 ## Firmware
 
 ### [Unreleased]
+- Update manufacturer HID descriptor to bitbox.swiss
 
 ### 9.21.0
 - Bitcoin: add support for sending to silent payment (BIP-352) addresses
@@ -147,6 +148,9 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 
 ## Bootloader
 
+### v1.0.7
+- Update manufacturer HID descriptor to bitbox.swiss
+
 ### v1.0.6
 - Replace root pubkeys
 

CMakeLists.txt

@@ -98,7 +98,7 @@ endif()
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
 set(FIRMWARE_VERSION "v9.21.0")
 set(FIRMWARE_BTC_ONLY_VERSION "v9.21.0")
-set(BOOTLOADER_VERSION "v1.0.6")
+set(BOOTLOADER_VERSION "v1.0.7")
 
 find_package(PythonInterp 3.6 REQUIRED)
 

src/usb/class/usb_desc.h

@@ -60,10 +60,10 @@
 
 #define USB_DESC_IMANUFACT 1
 #define USB_DESC_IMANUFACT_STR_DESC                                                             \
-    30, /* bLength */                                                                           \
+    26, /* bLength */                                                                           \
         0x03, /* bDescriptorType */                                                             \
-        's', 0, 'h', 0, 'i', 0, 'f', 0, 't', 0, 'c', 0, 'r', 0, 'y', 0, 'p', 0, 't', 0, 'o', 0, \
-        '.', 0, 'c', 0, 'h', 0,
+        'b', 0, 'i', 0, 't', 0, 'b', 0, 'o', 0, 'x', 0, '.', 0, 's', 0, 'w', 0, 'i', 0, 's', 0, \
+        's', 0,
 
 #define USB_DESC_IPRODUCT 2
 #if defined(BOOTLOADER)