arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

fix(common): change msg_id of RebootToBootloader from 804 to 87

Browse Source
This commit is contained in:
Pavol Rusnak 2021-03-03 12:06:04 +01:00
parent 77e99078c3
commit 4b0f41d41e
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/protob/messages.proto
View File

@ -81,6 +81,7 @@ enum MessageType {
MessageType_DoPreauthorized = 84 [(wire_in) = true]; MessageType_DoPreauthorized = 84 [(wire_in) = true];
MessageType_PreauthorizedRequest = 85 [(wire_out) = true]; MessageType_PreauthorizedRequest = 85 [(wire_out) = true];
MessageType_CancelAuthorization = 86 [(wire_in) = true]; MessageType_CancelAuthorization = 86 [(wire_in) = true];
MessageType_RebootToBootloader = 87 [(wire_in) = true];
// Deprecated messages, kept for protobuf compatibility. // Deprecated messages, kept for protobuf compatibility.
// Both are marked wire_out so that we don't need to implement incoming handler for legacy // 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_WebAuthnCredentials = 801 [(wire_out) = true];
MessageType_WebAuthnAddResidentCredential = 802 [(wire_in) = true]; MessageType_WebAuthnAddResidentCredential = 802 [(wire_in) = true];
MessageType_WebAuthnRemoveResidentCredential = 803 [(wire_in) = true]; MessageType_WebAuthnRemoveResidentCredential = 803 [(wire_in) = true];
MessageType_RebootToBootloader = 804 [(wire_in) = true];
} }

2
core/src/trezor/messages/MessageType.py
View File

@ -45,6 +45,7 @@ EndSession: Literal[83] = 83
DoPreauthorized: Literal[84] = 84 DoPreauthorized: Literal[84] = 84
PreauthorizedRequest: Literal[85] = 85 PreauthorizedRequest: Literal[85] = 85
CancelAuthorization: Literal[86] = 86 CancelAuthorization: Literal[86] = 86
RebootToBootloader: Literal[87] = 87
Deprecated_PassphraseStateRequest: Literal[77] = 77 Deprecated_PassphraseStateRequest: Literal[77] = 77
Deprecated_PassphraseStateAck: Literal[78] = 78 Deprecated_PassphraseStateAck: Literal[78] = 78
FirmwareErase: Literal[6] = 6 FirmwareErase: Literal[6] = 6
@ -207,4 +208,3 @@ if not utils.BITCOIN_ONLY:
WebAuthnCredentials: Literal[801] = 801 WebAuthnCredentials: Literal[801] = 801
WebAuthnAddResidentCredential: Literal[802] = 802 WebAuthnAddResidentCredential: Literal[802] = 802
WebAuthnRemoveResidentCredential: Literal[803] = 803 WebAuthnRemoveResidentCredential: Literal[803] = 803
RebootToBootloader: Literal[804] = 804

2
core/src/trezor/messages/RebootToBootloader.py
View File

@ -11,4 +11,4 @@ if __debug__:
class RebootToBootloader(p.MessageType): class RebootToBootloader(p.MessageType):
MESSAGE_WIRE_TYPE = 804 MESSAGE_WIRE_TYPE = 87

2
legacy/firmware/fsm.c
View File

@ -306,7 +306,7 @@ static bool fsm_layoutAddress(const char *address, const char *desc,
} }
void fsm_msgRebootToBootloader(void) { void fsm_msgRebootToBootloader(void) {
fsm_sendSuccess("You are being rebooted"); fsm_sendSuccess(_("You are being rebooted"));
#if !EMULATOR #if !EMULATOR
svc_reboot_to_bootloader(); svc_reboot_to_bootloader();
#else #else

2
python/src/trezorlib/messages/MessageType.py
View File

@ -43,6 +43,7 @@ EndSession: Literal[83] = 83
DoPreauthorized: Literal[84] = 84 DoPreauthorized: Literal[84] = 84
PreauthorizedRequest: Literal[85] = 85 PreauthorizedRequest: Literal[85] = 85
CancelAuthorization: Literal[86] = 86 CancelAuthorization: Literal[86] = 86
RebootToBootloader: Literal[87] = 87
Deprecated_PassphraseStateRequest: Literal[77] = 77 Deprecated_PassphraseStateRequest: Literal[77] = 77
Deprecated_PassphraseStateAck: Literal[78] = 78 Deprecated_PassphraseStateAck: Literal[78] = 78
FirmwareErase: Literal[6] = 6 FirmwareErase: Literal[6] = 6
@ -204,4 +205,3 @@ WebAuthnListResidentCredentials: Literal[800] = 800
WebAuthnCredentials: Literal[801] = 801 WebAuthnCredentials: Literal[801] = 801
WebAuthnAddResidentCredential: Literal[802] = 802 WebAuthnAddResidentCredential: Literal[802] = 802
WebAuthnRemoveResidentCredential: Literal[803] = 803 WebAuthnRemoveResidentCredential: Literal[803] = 803
RebootToBootloader: Literal[804] = 804

2
python/src/trezorlib/messages/RebootToBootloader.py
View File

@ -11,4 +11,4 @@ if __debug__:
class RebootToBootloader(p.MessageType): class RebootToBootloader(p.MessageType):
MESSAGE_WIRE_TYPE = 804 MESSAGE_WIRE_TYPE = 87