diff --git a/core/embed/models/T3W1/model_T3W1.h b/core/embed/models/T3W1/model_T3W1.h index bbc72c4520..85b27a7825 100644 --- a/core/embed/models/T3W1/model_T3W1.h +++ b/core/embed/models/T3W1/model_T3W1.h @@ -13,16 +13,15 @@ #define MODEL_USB_MANUFACTURER "Trezor Company" #define MODEL_USB_PRODUCT MODEL_FULL_NAME -// todo replace dev keys with produciton ones #define MODEL_BOARDLOADER_KEYS \ - (const uint8_t *)"\xdb\x99\x5f\xe2\x51\x69\xd1\x41\xca\xb9\xbb\xba\x92\xba\xa0\x1f\x9f\x2e\x1e\xce\x7d\xf4\xcb\x2a\xc0\x51\x90\xf3\x7f\xcc\x1f\x9d", \ -(const uint8_t *)"\x21\x52\xf8\xd1\x9b\x79\x1d\x24\x45\x32\x42\xe1\x5f\x2e\xab\x6c\xb7\xcf\xfa\x7b\x6a\x5e\xd3\x00\x97\x96\x0e\x06\x98\x81\xdb\x12", \ -(const uint8_t *)"\x22\xfc\x29\x77\x92\xf0\xb6\xff\xc0\xbf\xcf\xdb\x7e\xdb\x0c\x0a\xa1\x4e\x02\x5a\x36\x5e\xc0\xe3\x42\xe8\x6e\x38\x29\xcb\x74\xb6", + (const uint8_t *)"\xe8\x91\x2f\x81\xb3\xe7\x80\xee\x65\x0e\xd3\x85\x6d\xb5\x32\x6e\x0b\x9e\xff\x10\x36\x4b\x33\x91\x93\xe7\xa8\xf1\x0f\x76\x21\xb9", \ + (const uint8_t *)"\xbd\xe7\x0a\x38\xee\xe6\x33\xd2\x6f\x43\x4e\xee\x2f\x53\x6d\xf4\x57\xb8\xde\xb8\xbd\x98\x82\x94\xf4\xa0\xc8\xd9\x05\x49\x03\xd2", \ + (const uint8_t *)"\xa8\x5b\x60\x1d\xfb\xda\x1d\x22\xcc\xb5\xdd\x49\x2d\x26\x03\x4d\x87\xf6\x7f\x2a\x0b\x85\x84\xb7\x77\x44\x39\x46\x1f\xc4\x71\xa9", #define MODEL_BOOTLOADER_KEYS \ - (const uint8_t *)"\xd7\x59\x79\x3b\xbc\x13\xa2\x81\x9a\x82\x7c\x76\xad\xb6\xfb\xa8\xa4\x9a\xee\x00\x7f\x49\xf2\xd0\x99\x2d\x99\xb8\x25\xad\x2c\x48", \ -(const uint8_t *)"\x63\x55\x69\x1c\x17\x8a\x8f\xf9\x10\x07\xa7\x47\x8a\xfb\x95\x5e\xf7\x35\x2c\x63\xe7\xb2\x57\x03\x98\x4c\xf7\x8b\x26\xe2\x1a\x56", \ -(const uint8_t *)"\xee\x93\xa4\xf6\x6f\x8d\x16\xb8\x19\xbb\x9b\xeb\x9f\xfc\xcd\xfc\xdc\x14\x12\xe8\x7f\xee\x6a\x32\x4c\x2a\x99\xa1\xe0\xe6\x71\x48", + (const uint8_t *)"\x32\x0e\x11\x1e\x9d\xde\xd5\xfe\x7f\x5d\x41\xfd\x37\x2e\xf0\xe9\x1b\x2d\xfa\x4c\x6c\xdc\x9f\xe5\x22\x1b\xfb\x16\xaa\xf9\x17\x75", \ + (const uint8_t *)"\x2e\x34\x9f\x8d\x06\xb2\x33\x42\x62\xec\xb6\x03\xed\x04\xcb\x5a\x7c\xc0\xb6\x60\xeb\xe3\xcd\x5c\x29\x72\xb5\xcd\x1f\x38\xef\x85", \ + (const uint8_t *)"\xab\x0d\x3f\x91\xa4\xad\xf7\x44\x71\x9d\xba\x66\x17\x83\xec\x54\x9f\x73\xa4\xe4\x54\x57\xcb\x6d\x02\x75\x2a\x40\xfb\x63\xd3\xbf", #define IMAGE_CHUNK_SIZE SIZE_256K #define IMAGE_HASH_SHA256 diff --git a/core/embed/models/T3W1/vendorheader/vendor_dev_DO_NOT_SIGN.toif b/core/embed/models/T3W1/vendorheader/vendor_dev_DO_NOT_SIGN.toif deleted file mode 100644 index 24b655daec..0000000000 Binary files a/core/embed/models/T3W1/vendorheader/vendor_dev_DO_NOT_SIGN.toif and /dev/null differ diff --git a/core/embed/models/T3W1/vendorheader/vendor_dev_DO_NOT_SIGN.toif b/core/embed/models/T3W1/vendorheader/vendor_dev_DO_NOT_SIGN.toif new file mode 120000 index 0000000000..1fc9443937 --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_dev_DO_NOT_SIGN.toif @@ -0,0 +1 @@ +./vendor_unsafe.toif \ No newline at end of file diff --git a/core/embed/models/T3W1/vendorheader/vendor_prodtest.json b/core/embed/models/T3W1/vendorheader/vendor_prodtest.json new file mode 100644 index 0000000000..2e23951dc7 --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_prodtest.json @@ -0,0 +1,20 @@ +{ + "header_len": 1024, + "text": "UNSAFE, FACTORY TEST ONLY", + "hw_model": "T3W1", + "expiry": 0, + "version": [0, 0], + "sig_m": 2, + "trust": { + "allow_run_with_secret": true, + "show_vendor_string": false, + "require_user_click": false, + "red_background": false, + "delay": 0 + }, + "pubkeys": [ + "9ca51a1dbb48408feebcfac8dbf8873f7eacb59fe79eae8f1252564b42c56167", + "4d5fe85188ba43ae9c9510580564c7b630687831132a8a998ef136d32c357bb1", + "4d2dd6142cc06c25251439e6aac2fedca810a637e0aa42c676689094fcfb6c9f" + ] +} diff --git a/core/embed/models/T3W1/vendorheader/vendor_prodtest.toif b/core/embed/models/T3W1/vendorheader/vendor_prodtest.toif new file mode 120000 index 0000000000..1fc9443937 --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_prodtest.toif @@ -0,0 +1 @@ +./vendor_unsafe.toif \ No newline at end of file diff --git a/core/embed/models/T3W1/vendorheader/vendor_trezor.json b/core/embed/models/T3W1/vendorheader/vendor_trezor.json new file mode 100644 index 0000000000..7e5e4de1e8 --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_trezor.json @@ -0,0 +1,20 @@ +{ + "header_len": 1024, + "text": "Trezor", + "hw_model": "T3W1", + "expiry": 0, + "version": [0, 0], + "sig_m": 2, + "trust": { + "allow_run_with_secret": true, + "show_vendor_string": false, + "require_user_click": false, + "red_background": false, + "delay": 0 + }, + "pubkeys": [ + "529e65f30bdfe3182dc527425111c66305673d0cd98f27581a637e8eae10afd0", + "c131917b37eec9caf8a24a7d2c51bec10558bf162d87ee245d92dc7c0d9359fc", + "82732494e01f9470974fcd05cb630e15568467138cd30616575df896089b7dfa" + ] +} diff --git a/core/embed/models/T3W1/vendorheader/vendor_trezor.toif b/core/embed/models/T3W1/vendorheader/vendor_trezor.toif new file mode 100644 index 0000000000..c940ab1e15 Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendor_trezor.toif differ diff --git a/core/embed/models/T3W1/vendorheader/vendor_trezor_btconly.json b/core/embed/models/T3W1/vendorheader/vendor_trezor_btconly.json new file mode 100644 index 0000000000..39e33087fe --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_trezor_btconly.json @@ -0,0 +1,20 @@ +{ + "header_len": 1024, + "text": "Trezor Bitcoin-only", + "hw_model": "T3W1", + "expiry": 0, + "version": [0, 0], + "sig_m": 2, + "trust": { + "allow_run_with_secret": true, + "show_vendor_string": false, + "require_user_click": false, + "red_background": false, + "delay": 0 + }, + "pubkeys": [ + "408f8d50c3d87211883a2cd33d69d1dc86a653fa6a1c2f0a9ca50c92adf9578c", + "18175b8eaf3feb21b55c127cebd9a59bc790996caaff73bd24a1cde2c8edc8f4", + "37022ce1ccbf4f991def8688c89a4bbb6da369aa49a5ce840bbfca0d1ee3210f" + ] +} diff --git a/core/embed/models/T3W1/vendorheader/vendor_trezor_btconly.toif b/core/embed/models/T3W1/vendorheader/vendor_trezor_btconly.toif new file mode 120000 index 0000000000..f005020b4e --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_trezor_btconly.toif @@ -0,0 +1 @@ +./vendor_trezor.toif \ No newline at end of file diff --git a/core/embed/models/T3W1/vendorheader/vendor_unsafe.json b/core/embed/models/T3W1/vendorheader/vendor_unsafe.json new file mode 100644 index 0000000000..1881294d93 --- /dev/null +++ b/core/embed/models/T3W1/vendorheader/vendor_unsafe.json @@ -0,0 +1,20 @@ +{ + "header_len": 1024, + "text": "UNSAFE, DO NOT USE!", + "hw_model": "T3W1", + "expiry": 0, + "version": [0, 0], + "sig_m": 2, + "trust": { + "allow_run_with_secret": false, + "show_vendor_string": true, + "require_user_click": true, + "red_background": true, + "delay": 1 + }, + "pubkeys": [ + "e28a8970753332bd72fef413e6b0b2ef1b4aadda7aa2c141f233712a6876b351", + "d4eec1869fb1b8a4e817516ad5a931557cb56805c3eb16e8f3a803d647df7869", + "772c8a442b7db06e166cfbc1ccbcbcde6f3eba76a4e98ef3ffc519502237d6ef" + ] +} diff --git a/core/embed/models/T3W1/vendorheader/vendor_unsafe.toif b/core/embed/models/T3W1/vendorheader/vendor_unsafe.toif new file mode 100644 index 0000000000..24b655daec Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendor_unsafe.toif differ diff --git a/core/embed/models/T3W1/vendorheader/vendorheader_prodtest_unsigned.bin b/core/embed/models/T3W1/vendorheader/vendorheader_prodtest_unsigned.bin new file mode 100644 index 0000000000..a5714a79a8 Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendorheader_prodtest_unsigned.bin differ diff --git a/core/embed/models/T3W1/vendorheader/vendorheader_trezor_btconly_unsigned.bin b/core/embed/models/T3W1/vendorheader/vendorheader_trezor_btconly_unsigned.bin new file mode 100644 index 0000000000..7ca9e32561 Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendorheader_trezor_btconly_unsigned.bin differ diff --git a/core/embed/models/T3W1/vendorheader/vendorheader_trezor_unsigned.bin b/core/embed/models/T3W1/vendorheader/vendorheader_trezor_unsigned.bin new file mode 100644 index 0000000000..0ee5922b8d Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendorheader_trezor_unsigned.bin differ diff --git a/core/embed/models/T3W1/vendorheader/vendorheader_unsafe_signed_dev.bin b/core/embed/models/T3W1/vendorheader/vendorheader_unsafe_signed_dev.bin new file mode 100644 index 0000000000..b342534302 Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendorheader_unsafe_signed_dev.bin differ diff --git a/core/embed/models/T3W1/vendorheader/vendorheader_unsafe_unsigned.bin b/core/embed/models/T3W1/vendorheader/vendorheader_unsafe_unsigned.bin new file mode 100644 index 0000000000..043768b2a8 Binary files /dev/null and b/core/embed/models/T3W1/vendorheader/vendorheader_unsafe_unsigned.bin differ