From 4b0f41d41ebf15cff1c7c2fb18a6a3a21316512b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 3 Mar 2021 12:06:04 +0100 Subject: [PATCH] fix(common): change msg_id of RebootToBootloader from 804 to 87 --- common/protob/messages.proto | 3 +-- core/src/trezor/messages/MessageType.py | 2 +- core/src/trezor/messages/RebootToBootloader.py | 2 +- legacy/firmware/fsm.c | 2 +- python/src/trezorlib/messages/MessageType.py | 2 +- python/src/trezorlib/messages/RebootToBootloader.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/protob/messages.proto b/common/protob/messages.proto index bb4483e7f..019309b5c 100644 --- a/common/protob/messages.proto +++ b/common/protob/messages.proto @@ -81,6 +81,7 @@ enum MessageType { MessageType_DoPreauthorized = 84 [(wire_in) = true]; MessageType_PreauthorizedRequest = 85 [(wire_out) = true]; MessageType_CancelAuthorization = 86 [(wire_in) = true]; + MessageType_RebootToBootloader = 87 [(wire_in) = true]; // Deprecated messages, kept for protobuf compatibility. // Both are marked wire_out so that we don't need to implement incoming handler for legacy @@ -278,6 +279,4 @@ enum MessageType { MessageType_WebAuthnCredentials = 801 [(wire_out) = true]; MessageType_WebAuthnAddResidentCredential = 802 [(wire_in) = true]; MessageType_WebAuthnRemoveResidentCredential = 803 [(wire_in) = true]; - - MessageType_RebootToBootloader = 804 [(wire_in) = true]; } diff --git a/core/src/trezor/messages/MessageType.py b/core/src/trezor/messages/MessageType.py index 5b78fe6e4..c273eff6b 100644 --- a/core/src/trezor/messages/MessageType.py +++ b/core/src/trezor/messages/MessageType.py @@ -45,6 +45,7 @@ EndSession: Literal[83] = 83 DoPreauthorized: Literal[84] = 84 PreauthorizedRequest: Literal[85] = 85 CancelAuthorization: Literal[86] = 86 +RebootToBootloader: Literal[87] = 87 Deprecated_PassphraseStateRequest: Literal[77] = 77 Deprecated_PassphraseStateAck: Literal[78] = 78 FirmwareErase: Literal[6] = 6 @@ -207,4 +208,3 @@ if not utils.BITCOIN_ONLY: WebAuthnCredentials: Literal[801] = 801 WebAuthnAddResidentCredential: Literal[802] = 802 WebAuthnRemoveResidentCredential: Literal[803] = 803 -RebootToBootloader: Literal[804] = 804 diff --git a/core/src/trezor/messages/RebootToBootloader.py b/core/src/trezor/messages/RebootToBootloader.py index c7175d00e..c6b035aba 100644 --- a/core/src/trezor/messages/RebootToBootloader.py +++ b/core/src/trezor/messages/RebootToBootloader.py @@ -11,4 +11,4 @@ if __debug__: class RebootToBootloader(p.MessageType): - MESSAGE_WIRE_TYPE = 804 + MESSAGE_WIRE_TYPE = 87 diff --git a/legacy/firmware/fsm.c b/legacy/firmware/fsm.c index b44e7ab34..01e3d2f14 100644 --- a/legacy/firmware/fsm.c +++ b/legacy/firmware/fsm.c @@ -306,7 +306,7 @@ static bool fsm_layoutAddress(const char *address, const char *desc, } void fsm_msgRebootToBootloader(void) { - fsm_sendSuccess("You are being rebooted"); + fsm_sendSuccess(_("You are being rebooted")); #if !EMULATOR svc_reboot_to_bootloader(); #else diff --git a/python/src/trezorlib/messages/MessageType.py b/python/src/trezorlib/messages/MessageType.py index 8a83aab71..279d777de 100644 --- a/python/src/trezorlib/messages/MessageType.py +++ b/python/src/trezorlib/messages/MessageType.py @@ -43,6 +43,7 @@ EndSession: Literal[83] = 83 DoPreauthorized: Literal[84] = 84 PreauthorizedRequest: Literal[85] = 85 CancelAuthorization: Literal[86] = 86 +RebootToBootloader: Literal[87] = 87 Deprecated_PassphraseStateRequest: Literal[77] = 77 Deprecated_PassphraseStateAck: Literal[78] = 78 FirmwareErase: Literal[6] = 6 @@ -204,4 +205,3 @@ WebAuthnListResidentCredentials: Literal[800] = 800 WebAuthnCredentials: Literal[801] = 801 WebAuthnAddResidentCredential: Literal[802] = 802 WebAuthnRemoveResidentCredential: Literal[803] = 803 -RebootToBootloader: Literal[804] = 804 diff --git a/python/src/trezorlib/messages/RebootToBootloader.py b/python/src/trezorlib/messages/RebootToBootloader.py index 9d767a02c..880c0edd7 100644 --- a/python/src/trezorlib/messages/RebootToBootloader.py +++ b/python/src/trezorlib/messages/RebootToBootloader.py @@ -11,4 +11,4 @@ if __debug__: class RebootToBootloader(p.MessageType): - MESSAGE_WIRE_TYPE = 804 + MESSAGE_WIRE_TYPE = 87