diff --git a/common/protob/messages-common.proto b/common/protob/messages-common.proto index 4dd16add5b..9e7bf9418a 100644 --- a/common/protob/messages-common.proto +++ b/common/protob/messages-common.proto @@ -39,10 +39,10 @@ message Failure { Failure_PinMismatch = 12; Failure_WipeCodeMismatch = 13; Failure_InvalidSession = 14; - Failure_ThpUnallocatedSession = 15; - Failure_InvalidProtocol = 16; - Failure_BufferError = 17; - Failure_DeviceIsBusy = 18; + Failure_DeviceIsBusy = 15; + Failure_ThpUnallocatedSession = 16; + Failure_InvalidProtocol = 17; + Failure_BufferError = 18; Failure_FirmwareError = 99; } } diff --git a/core/src/trezor/enums/FailureType.py b/core/src/trezor/enums/FailureType.py index e95dcb803f..7609e9100c 100644 --- a/core/src/trezor/enums/FailureType.py +++ b/core/src/trezor/enums/FailureType.py @@ -16,8 +16,8 @@ NotInitialized = 11 PinMismatch = 12 WipeCodeMismatch = 13 InvalidSession = 14 -ThpUnallocatedSession = 15 -InvalidProtocol = 16 -BufferError = 17 -DeviceIsBusy = 18 +DeviceIsBusy = 15 +ThpUnallocatedSession = 16 +InvalidProtocol = 17 +BufferError = 18 FirmwareError = 99 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index 04d6b18cd9..dee7a90503 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -39,10 +39,10 @@ if TYPE_CHECKING: PinMismatch = 12 WipeCodeMismatch = 13 InvalidSession = 14 - ThpUnallocatedSession = 15 - InvalidProtocol = 16 - BufferError = 17 - DeviceIsBusy = 18 + DeviceIsBusy = 15 + ThpUnallocatedSession = 16 + InvalidProtocol = 17 + BufferError = 18 FirmwareError = 99 class ButtonRequestType(IntEnum): diff --git a/core/src/trezor/wire/thp/thp_main.py b/core/src/trezor/wire/thp/thp_main.py index 5482cf396c..2e16a0f8b3 100644 --- a/core/src/trezor/wire/thp/thp_main.py +++ b/core/src/trezor/wire/thp/thp_main.py @@ -161,5 +161,5 @@ def _get_ctrl_byte(packet: bytes) -> int: def _get_codec_v1_error_message() -> bytes: # Codec_v1 magic constant "?##" + Failure message type + msg_size # + msg_data (code = "Failure_InvalidProtocol") + padding to 64 B - ERROR_MSG = b"\x3f\x23\x23\x00\x03\x00\x00\x00\x14\x08\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + ERROR_MSG = b"\x3f\x23\x23\x00\x03\x00\x00\x00\x14\x08\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" return ERROR_MSG diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py index b12eb19fde..3f7f44fdaf 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -43,10 +43,10 @@ class FailureType(IntEnum): PinMismatch = 12 WipeCodeMismatch = 13 InvalidSession = 14 - ThpUnallocatedSession = 15 - InvalidProtocol = 16 - BufferError = 17 - DeviceIsBusy = 18 + DeviceIsBusy = 15 + ThpUnallocatedSession = 16 + InvalidProtocol = 17 + BufferError = 18 FirmwareError = 99 diff --git a/rust/trezor-client/src/protos/generated/messages_common.rs b/rust/trezor-client/src/protos/generated/messages_common.rs index 55b796f7b4..976d0c707a 100644 --- a/rust/trezor-client/src/protos/generated/messages_common.rs +++ b/rust/trezor-client/src/protos/generated/messages_common.rs @@ -414,14 +414,14 @@ pub mod failure { Failure_WipeCodeMismatch = 13, // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidSession) Failure_InvalidSession = 14, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_ThpUnallocatedSession) - Failure_ThpUnallocatedSession = 15, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidProtocol) - Failure_InvalidProtocol = 16, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_BufferError) - Failure_BufferError = 17, // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_DeviceIsBusy) - Failure_DeviceIsBusy = 18, + Failure_DeviceIsBusy = 15, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_ThpUnallocatedSession) + Failure_ThpUnallocatedSession = 16, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_InvalidProtocol) + Failure_InvalidProtocol = 17, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_BufferError) + Failure_BufferError = 18, // @@protoc_insertion_point(enum_value:hw.trezor.messages.common.Failure.FailureType.Failure_FirmwareError) Failure_FirmwareError = 99, } @@ -449,10 +449,10 @@ pub mod failure { 12 => ::std::option::Option::Some(FailureType::Failure_PinMismatch), 13 => ::std::option::Option::Some(FailureType::Failure_WipeCodeMismatch), 14 => ::std::option::Option::Some(FailureType::Failure_InvalidSession), - 15 => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession), - 16 => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol), - 17 => ::std::option::Option::Some(FailureType::Failure_BufferError), - 18 => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy), + 15 => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy), + 16 => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession), + 17 => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol), + 18 => ::std::option::Option::Some(FailureType::Failure_BufferError), 99 => ::std::option::Option::Some(FailureType::Failure_FirmwareError), _ => ::std::option::Option::None } @@ -474,10 +474,10 @@ pub mod failure { "Failure_PinMismatch" => ::std::option::Option::Some(FailureType::Failure_PinMismatch), "Failure_WipeCodeMismatch" => ::std::option::Option::Some(FailureType::Failure_WipeCodeMismatch), "Failure_InvalidSession" => ::std::option::Option::Some(FailureType::Failure_InvalidSession), + "Failure_DeviceIsBusy" => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy), "Failure_ThpUnallocatedSession" => ::std::option::Option::Some(FailureType::Failure_ThpUnallocatedSession), "Failure_InvalidProtocol" => ::std::option::Option::Some(FailureType::Failure_InvalidProtocol), "Failure_BufferError" => ::std::option::Option::Some(FailureType::Failure_BufferError), - "Failure_DeviceIsBusy" => ::std::option::Option::Some(FailureType::Failure_DeviceIsBusy), "Failure_FirmwareError" => ::std::option::Option::Some(FailureType::Failure_FirmwareError), _ => ::std::option::Option::None } @@ -498,10 +498,10 @@ pub mod failure { FailureType::Failure_PinMismatch, FailureType::Failure_WipeCodeMismatch, FailureType::Failure_InvalidSession, + FailureType::Failure_DeviceIsBusy, FailureType::Failure_ThpUnallocatedSession, FailureType::Failure_InvalidProtocol, FailureType::Failure_BufferError, - FailureType::Failure_DeviceIsBusy, FailureType::Failure_FirmwareError, ]; } @@ -528,10 +528,10 @@ pub mod failure { FailureType::Failure_PinMismatch => 11, FailureType::Failure_WipeCodeMismatch => 12, FailureType::Failure_InvalidSession => 13, - FailureType::Failure_ThpUnallocatedSession => 14, - FailureType::Failure_InvalidProtocol => 15, - FailureType::Failure_BufferError => 16, - FailureType::Failure_DeviceIsBusy => 17, + FailureType::Failure_DeviceIsBusy => 14, + FailureType::Failure_ThpUnallocatedSession => 15, + FailureType::Failure_InvalidProtocol => 16, + FailureType::Failure_BufferError => 17, FailureType::Failure_FirmwareError => 18, }; Self::enum_descriptor().value_by_index(index) @@ -2516,10 +2516,10 @@ static file_descriptor_proto_data: &'static [u8] = b"\ essError\x10\t\x12\x1a\n\x16Failure_NotEnoughFunds\x10\n\x12\x1a\n\x16Fa\ ilure_NotInitialized\x10\x0b\x12\x17\n\x13Failure_PinMismatch\x10\x0c\ \x12\x1c\n\x18Failure_WipeCodeMismatch\x10\r\x12\x1a\n\x16Failure_Invali\ - dSession\x10\x0e\x12!\n\x1dFailure_ThpUnallocatedSession\x10\x0f\x12\x1b\ - \n\x17Failure_InvalidProtocol\x10\x10\x12\x17\n\x13Failure_BufferError\ - \x10\x11\x12\x18\n\x14Failure_DeviceIsBusy\x10\x12\x12\x19\n\x15Failure_\ - FirmwareError\x10c\"\xab\x06\n\rButtonRequest\x12N\n\x04code\x18\x01\x20\ + dSession\x10\x0e\x12\x18\n\x14Failure_DeviceIsBusy\x10\x0f\x12!\n\x1dFai\ + lure_ThpUnallocatedSession\x10\x10\x12\x1b\n\x17Failure_InvalidProtocol\ + \x10\x11\x12\x17\n\x13Failure_BufferError\x10\x12\x12\x19\n\x15Failure_F\ + irmwareError\x10c\"\xab\x06\n\rButtonRequest\x12N\n\x04code\x18\x01\x20\ \x01(\x0e2:.hw.trezor.messages.common.ButtonRequest.ButtonRequestTypeR\ \x04code\x12\x14\n\x05pages\x18\x02\x20\x01(\rR\x05pages\x12\x12\n\x04na\ me\x18\x04\x20\x01(\tR\x04name\"\x99\x05\n\x11ButtonRequestType\x12\x17\