From 15cf9da5332292cd58411fa9d85e5e0240c183a0 Mon Sep 17 00:00:00 2001 From: M1nd3r Date: Thu, 28 Mar 2024 12:17:50 +0100 Subject: [PATCH] Fix checks (except style) --- common/protob/messages-thp.proto | 14 +- common/protob/messages.proto | 16 +- core/src/all_modules.py | 4 +- core/src/trezor/enums/MessageType.py | 16 +- core/src/trezor/enums/PairingMethod.py | 8 - core/src/trezor/enums/ThpPairingMethod.py | 8 + core/src/trezor/enums/__init__.py | 26 +- core/src/trezor/messages.py | 26 +- core/src/trezor/wire/thp/channel_context.py | 4 +- python/src/trezorlib/messages.py | 46 +-- rust/trezor-client/src/messages/generated.rs | 16 +- .../src/protos/generated/messages.rs | 166 ++++----- .../src/protos/generated/messages_thp.rs | 334 +++++++++--------- 13 files changed, 342 insertions(+), 342 deletions(-) delete mode 100644 core/src/trezor/enums/PairingMethod.py create mode 100644 core/src/trezor/enums/ThpPairingMethod.py diff --git a/common/protob/messages-thp.proto b/common/protob/messages-thp.proto index 919d28968..e1ff2c5c8 100644 --- a/common/protob/messages-thp.proto +++ b/common/protob/messages-thp.proto @@ -8,31 +8,31 @@ option java_outer_classname = "TrezorMessageThp"; // Numeric identifiers of pairing methods. -enum PairingMethod { +enum ThpPairingMethod { PairingMethod_NoMethod = 1; // Trust without MITM protection. PairingMethod_CodeEntry = 2; // User types code diplayed on Trezor into the host application. PairingMethod_QrCode = 3; // User scans code displayed on Trezor into host application. PairingMethod_NFC_Unidirectional = 4; // Trezor transmits an authentication key to the host device via NFC. } -message DeviceProperties { +message ThpDeviceProperties { optional string internal_model = 1; // Internal model name e.g. "T2B1". optional uint32 model_variant = 2; // Encodes the device properties such as color. optional bool bootloader_mode = 3; // Indicates whether the device is in bootloader or firmware mode. optional uint32 protocol_version = 4; // The communication protocol version supported by the firmware. - repeated PairingMethod pairing_methods = 5; // The pairing methods supported by the Trezor. + repeated ThpPairingMethod pairing_methods = 5; // The pairing methods supported by the Trezor. } -message HandshakeCompletionReqNoisePayload { +message ThpHandshakeCompletionReqNoisePayload { optional bytes host_pairing_credential = 1; // Host's pairing credential - repeated PairingMethod pairing_methods = 2; // The pairing methods chosen by the host + repeated ThpPairingMethod pairing_methods = 2; // The pairing methods chosen by the host } -message CreateNewSession{ +message ThpCreateNewSession{ optional string passphrase = 1; optional bool on_device = 2; // user wants to enter passphrase on the device } -message NewSession{ +message ThpNewSession{ optional uint32 new_session_id = 1; } diff --git a/common/protob/messages.proto b/common/protob/messages.proto index d9dbdc685..0c6dc5cf6 100644 --- a/common/protob/messages.proto +++ b/common/protob/messages.proto @@ -377,13 +377,13 @@ enum MessageType { MessageType_SolanaTxSignature = 905 [(wire_out) = true]; // THP - MessageType_StartPairingRequest = 1000 [(bitcoin_only) = true, (wire_in) = true]; - MessageType_StartPairingResponse = 1001 [(bitcoin_only) = true, (wire_out) = true]; - MessageType_CredentialRequest = 1002 [(bitcoin_only) = true, (wire_in) = true]; - MessageType_CredentialResponse = 1003 [(bitcoin_only) = true, (wire_out) = true]; - MessageType_EndRequest = 1004 [(bitcoin_only) = true, (wire_in) = true]; - MessageType_EndResponse = 1005 [(bitcoin_only) = true, (wire_out) = true]; - MessageType_CreateNewSession = 1006[(bitcoin_only)=true,(wire_in)=true]; - MessageType_NewSession = 1007[(bitcoin_only)=true,(wire_out)=true]; + MessageType_ThpStartPairingRequest = 1000 [(bitcoin_only) = true, (wire_in) = true]; + MessageType_ThpStartPairingResponse = 1001 [(bitcoin_only) = true, (wire_out) = true]; + MessageType_ThpCredentialRequest = 1002 [(bitcoin_only) = true, (wire_in) = true]; + MessageType_ThpCredentialResponse = 1003 [(bitcoin_only) = true, (wire_out) = true]; + MessageType_ThpEndRequest = 1004 [(bitcoin_only) = true, (wire_in) = true]; + MessageType_ThpEndResponse = 1005 [(bitcoin_only) = true, (wire_out) = true]; + MessageType_ThpCreateNewSession = 1006[(bitcoin_only)=true,(wire_in)=true]; + MessageType_ThpNewSession = 1007[(bitcoin_only)=true,(wire_out)=true]; } diff --git a/core/src/all_modules.py b/core/src/all_modules.py index 1a9e97f57..6dceb1a3c 100644 --- a/core/src/all_modules.py +++ b/core/src/all_modules.py @@ -123,8 +123,6 @@ trezor.enums.MessageType import trezor.enums.MessageType trezor.enums.OutputScriptType import trezor.enums.OutputScriptType -trezor.enums.PairingMethod -import trezor.enums.PairingMethod trezor.enums.PinMatrixRequestType import trezor.enums.PinMatrixRequestType trezor.enums.RecoveryDeviceType @@ -135,6 +133,8 @@ trezor.enums.SafetyCheckLevel import trezor.enums.SafetyCheckLevel trezor.enums.SdProtectOperationType import trezor.enums.SdProtectOperationType +trezor.enums.ThpPairingMethod +import trezor.enums.ThpPairingMethod trezor.enums.WordRequestType import trezor.enums.WordRequestType trezor.enums diff --git a/core/src/trezor/enums/MessageType.py b/core/src/trezor/enums/MessageType.py index 7bc467cd7..76b27f170 100644 --- a/core/src/trezor/enums/MessageType.py +++ b/core/src/trezor/enums/MessageType.py @@ -97,14 +97,14 @@ DebugLinkRecordScreen = 9003 DebugLinkEraseSdCard = 9005 DebugLinkWatchLayout = 9006 DebugLinkResetDebugEvents = 9007 -StartPairingRequest = 1000 -StartPairingResponse = 1001 -CredentialRequest = 1002 -CredentialResponse = 1003 -EndRequest = 1004 -EndResponse = 1005 -CreateNewSession = 1006 -NewSession = 1007 +ThpStartPairingRequest = 1000 +ThpStartPairingResponse = 1001 +ThpCredentialRequest = 1002 +ThpCredentialResponse = 1003 +ThpEndRequest = 1004 +ThpEndResponse = 1005 +ThpCreateNewSession = 1006 +ThpNewSession = 1007 if not utils.BITCOIN_ONLY: SetU2FCounter = 63 GetNextU2FCounter = 80 diff --git a/core/src/trezor/enums/PairingMethod.py b/core/src/trezor/enums/PairingMethod.py deleted file mode 100644 index b356cdf47..000000000 --- a/core/src/trezor/enums/PairingMethod.py +++ /dev/null @@ -1,8 +0,0 @@ -# Automatically generated by pb2py -# fmt: off -# isort:skip_file - -NoMethod = 1 -CodeEntry = 2 -QrCode = 3 -NFC_Unidirectional = 4 diff --git a/core/src/trezor/enums/ThpPairingMethod.py b/core/src/trezor/enums/ThpPairingMethod.py new file mode 100644 index 000000000..c86c6ae82 --- /dev/null +++ b/core/src/trezor/enums/ThpPairingMethod.py @@ -0,0 +1,8 @@ +# Automatically generated by pb2py +# fmt: off +# isort:skip_file + +PairingMethod_NoMethod = 1 +PairingMethod_CodeEntry = 2 +PairingMethod_QrCode = 3 +PairingMethod_NFC_Unidirectional = 4 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index c26138027..3b079468e 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -264,14 +264,14 @@ if TYPE_CHECKING: SolanaAddress = 903 SolanaSignTx = 904 SolanaTxSignature = 905 - StartPairingRequest = 1000 - StartPairingResponse = 1001 - CredentialRequest = 1002 - CredentialResponse = 1003 - EndRequest = 1004 - EndResponse = 1005 - CreateNewSession = 1006 - NewSession = 1007 + ThpStartPairingRequest = 1000 + ThpStartPairingResponse = 1001 + ThpCredentialRequest = 1002 + ThpCredentialResponse = 1003 + ThpEndRequest = 1004 + ThpEndResponse = 1005 + ThpCreateNewSession = 1006 + ThpNewSession = 1007 class FailureType(IntEnum): UnexpectedMessage = 1 @@ -552,8 +552,8 @@ if TYPE_CHECKING: Nay = 1 Pass = 2 - class PairingMethod(IntEnum): - NoMethod = 1 - CodeEntry = 2 - QrCode = 3 - NFC_Unidirectional = 4 + class ThpPairingMethod(IntEnum): + PairingMethod_NoMethod = 1 + PairingMethod_CodeEntry = 2 + PairingMethod_QrCode = 3 + PairingMethod_NFC_Unidirectional = 4 diff --git a/core/src/trezor/messages.py b/core/src/trezor/messages.py index 43959aa0d..bce5c76ba 100644 --- a/core/src/trezor/messages.py +++ b/core/src/trezor/messages.py @@ -51,7 +51,6 @@ if TYPE_CHECKING: from trezor.enums import NEMMosaicLevy # noqa: F401 from trezor.enums import NEMSupplyChangeType # noqa: F401 from trezor.enums import OutputScriptType # noqa: F401 - from trezor.enums import PairingMethod # noqa: F401 from trezor.enums import PinMatrixRequestType # noqa: F401 from trezor.enums import RecoveryDeviceType # noqa: F401 from trezor.enums import RequestType # noqa: F401 @@ -62,6 +61,7 @@ if TYPE_CHECKING: from trezor.enums import StellarSignerType # noqa: F401 from trezor.enums import TezosBallotType # noqa: F401 from trezor.enums import TezosContractType # noqa: F401 + from trezor.enums import ThpPairingMethod # noqa: F401 from trezor.enums import WordRequestType # noqa: F401 class BinanceGetAddress(protobuf.MessageType): @@ -6098,17 +6098,17 @@ if TYPE_CHECKING: def is_type_of(cls, msg: Any) -> TypeGuard["TezosManagerTransfer"]: return isinstance(msg, cls) - class DeviceProperties(protobuf.MessageType): + class ThpDeviceProperties(protobuf.MessageType): internal_model: "str | None" model_variant: "int | None" bootloader_mode: "bool | None" protocol_version: "int | None" - pairing_methods: "list[PairingMethod]" + pairing_methods: "list[ThpPairingMethod]" def __init__( self, *, - pairing_methods: "list[PairingMethod] | None" = None, + pairing_methods: "list[ThpPairingMethod] | None" = None, internal_model: "str | None" = None, model_variant: "int | None" = None, bootloader_mode: "bool | None" = None, @@ -6117,26 +6117,26 @@ if TYPE_CHECKING: pass @classmethod - def is_type_of(cls, msg: Any) -> TypeGuard["DeviceProperties"]: + def is_type_of(cls, msg: Any) -> TypeGuard["ThpDeviceProperties"]: return isinstance(msg, cls) - class HandshakeCompletionReqNoisePayload(protobuf.MessageType): + class ThpHandshakeCompletionReqNoisePayload(protobuf.MessageType): host_pairing_credential: "bytes | None" - pairing_methods: "list[PairingMethod]" + pairing_methods: "list[ThpPairingMethod]" def __init__( self, *, - pairing_methods: "list[PairingMethod] | None" = None, + pairing_methods: "list[ThpPairingMethod] | None" = None, host_pairing_credential: "bytes | None" = None, ) -> None: pass @classmethod - def is_type_of(cls, msg: Any) -> TypeGuard["HandshakeCompletionReqNoisePayload"]: + def is_type_of(cls, msg: Any) -> TypeGuard["ThpHandshakeCompletionReqNoisePayload"]: return isinstance(msg, cls) - class CreateNewSession(protobuf.MessageType): + class ThpCreateNewSession(protobuf.MessageType): passphrase: "str | None" on_device: "bool | None" @@ -6149,10 +6149,10 @@ if TYPE_CHECKING: pass @classmethod - def is_type_of(cls, msg: Any) -> TypeGuard["CreateNewSession"]: + def is_type_of(cls, msg: Any) -> TypeGuard["ThpCreateNewSession"]: return isinstance(msg, cls) - class NewSession(protobuf.MessageType): + class ThpNewSession(protobuf.MessageType): new_session_id: "int | None" def __init__( @@ -6163,7 +6163,7 @@ if TYPE_CHECKING: pass @classmethod - def is_type_of(cls, msg: Any) -> TypeGuard["NewSession"]: + def is_type_of(cls, msg: Any) -> TypeGuard["ThpNewSession"]: return isinstance(msg, cls) class WebAuthnListResidentCredentials(protobuf.MessageType): diff --git a/core/src/trezor/wire/thp/channel_context.py b/core/src/trezor/wire/thp/channel_context.py index 29d2f40a7..eb6aa3144 100644 --- a/core/src/trezor/wire/thp/channel_context.py +++ b/core/src/trezor/wire/thp/channel_context.py @@ -7,7 +7,7 @@ import usb from storage import cache_thp from storage.cache_thp import KEY_LENGTH, TAG_LENGTH, ChannelCache from trezor import loop, protobuf, utils -from trezor.messages import CreateNewSession +from trezor.messages import ThpCreateNewSession from trezor.wire import message_handler from ..protocol_common import Context @@ -197,7 +197,7 @@ class ChannelContext(Context): message = message_handler.wrap_protobuf_load(buf, expected_type) print(message) # ------------------------------------------------TYPE ERROR------------------------------------------------ - session_message: CreateNewSession = message + session_message: ThpCreateNewSession = message print("passphrase:", session_message.passphrase) # await thp_messages.handle_CreateNewSession(message) if session_message.passphrase is not None: diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py index a8e14325b..87f9839a6 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -272,14 +272,14 @@ class MessageType(IntEnum): SolanaAddress = 903 SolanaSignTx = 904 SolanaTxSignature = 905 - StartPairingRequest = 1000 - StartPairingResponse = 1001 - CredentialRequest = 1002 - CredentialResponse = 1003 - EndRequest = 1004 - EndResponse = 1005 - CreateNewSession = 1006 - NewSession = 1007 + ThpStartPairingRequest = 1000 + ThpStartPairingResponse = 1001 + ThpCredentialRequest = 1002 + ThpCredentialResponse = 1003 + ThpEndRequest = 1004 + ThpEndResponse = 1005 + ThpCreateNewSession = 1006 + ThpNewSession = 1007 class FailureType(IntEnum): @@ -603,11 +603,11 @@ class TezosBallotType(IntEnum): Pass = 2 -class PairingMethod(IntEnum): - NoMethod = 1 - CodeEntry = 2 - QrCode = 3 - NFC_Unidirectional = 4 +class ThpPairingMethod(IntEnum): + PairingMethod_NoMethod = 1 + PairingMethod_CodeEntry = 2 + PairingMethod_QrCode = 3 + PairingMethod_NFC_Unidirectional = 4 class BinanceGetAddress(protobuf.MessageType): @@ -7716,50 +7716,50 @@ class TezosManagerTransfer(protobuf.MessageType): self.amount = amount -class DeviceProperties(protobuf.MessageType): +class ThpDeviceProperties(protobuf.MessageType): MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("internal_model", "string", repeated=False, required=False, default=None), 2: protobuf.Field("model_variant", "uint32", repeated=False, required=False, default=None), 3: protobuf.Field("bootloader_mode", "bool", repeated=False, required=False, default=None), 4: protobuf.Field("protocol_version", "uint32", repeated=False, required=False, default=None), - 5: protobuf.Field("pairing_methods", "PairingMethod", repeated=True, required=False, default=None), + 5: protobuf.Field("pairing_methods", "ThpPairingMethod", repeated=True, required=False, default=None), } def __init__( self, *, - pairing_methods: Optional[Sequence["PairingMethod"]] = None, + pairing_methods: Optional[Sequence["ThpPairingMethod"]] = None, internal_model: Optional["str"] = None, model_variant: Optional["int"] = None, bootloader_mode: Optional["bool"] = None, protocol_version: Optional["int"] = None, ) -> None: - self.pairing_methods: Sequence["PairingMethod"] = pairing_methods if pairing_methods is not None else [] + self.pairing_methods: Sequence["ThpPairingMethod"] = pairing_methods if pairing_methods is not None else [] self.internal_model = internal_model self.model_variant = model_variant self.bootloader_mode = bootloader_mode self.protocol_version = protocol_version -class HandshakeCompletionReqNoisePayload(protobuf.MessageType): +class ThpHandshakeCompletionReqNoisePayload(protobuf.MessageType): MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("host_pairing_credential", "bytes", repeated=False, required=False, default=None), - 2: protobuf.Field("pairing_methods", "PairingMethod", repeated=True, required=False, default=None), + 2: protobuf.Field("pairing_methods", "ThpPairingMethod", repeated=True, required=False, default=None), } def __init__( self, *, - pairing_methods: Optional[Sequence["PairingMethod"]] = None, + pairing_methods: Optional[Sequence["ThpPairingMethod"]] = None, host_pairing_credential: Optional["bytes"] = None, ) -> None: - self.pairing_methods: Sequence["PairingMethod"] = pairing_methods if pairing_methods is not None else [] + self.pairing_methods: Sequence["ThpPairingMethod"] = pairing_methods if pairing_methods is not None else [] self.host_pairing_credential = host_pairing_credential -class CreateNewSession(protobuf.MessageType): +class ThpCreateNewSession(protobuf.MessageType): MESSAGE_WIRE_TYPE = 1006 FIELDS = { 1: protobuf.Field("passphrase", "string", repeated=False, required=False, default=None), @@ -7776,7 +7776,7 @@ class CreateNewSession(protobuf.MessageType): self.on_device = on_device -class NewSession(protobuf.MessageType): +class ThpNewSession(protobuf.MessageType): MESSAGE_WIRE_TYPE = 1007 FIELDS = { 1: protobuf.Field("new_session_id", "uint32", repeated=False, required=False, default=None), diff --git a/rust/trezor-client/src/messages/generated.rs b/rust/trezor-client/src/messages/generated.rs index dcd1713d9..b576351df 100644 --- a/rust/trezor-client/src/messages/generated.rs +++ b/rust/trezor-client/src/messages/generated.rs @@ -82,14 +82,14 @@ trezor_message_impl! { DebugLinkEraseSdCard => MessageType_DebugLinkEraseSdCard, DebugLinkWatchLayout => MessageType_DebugLinkWatchLayout, DebugLinkResetDebugEvents => MessageType_DebugLinkResetDebugEvents, - StartPairingRequest => MessageType_StartPairingRequest, - StartPairingResponse => MessageType_StartPairingResponse, - CredentialRequest => MessageType_CredentialRequest, - CredentialResponse => MessageType_CredentialResponse, - EndRequest => MessageType_EndRequest, - EndResponse => MessageType_EndResponse, - CreateNewSession => MessageType_CreateNewSession, - NewSession => MessageType_NewSession, + ThpStartPairingRequest => MessageType_ThpStartPairingRequest, + ThpStartPairingResponse => MessageType_ThpStartPairingResponse, + ThpCredentialRequest => MessageType_ThpCredentialRequest, + ThpCredentialResponse => MessageType_ThpCredentialResponse, + ThpEndRequest => MessageType_ThpEndRequest, + ThpEndResponse => MessageType_ThpEndResponse, + ThpCreateNewSession => MessageType_ThpCreateNewSession, + ThpNewSession => MessageType_ThpNewSession, } #[cfg(feature = "binance")] diff --git a/rust/trezor-client/src/protos/generated/messages.rs b/rust/trezor-client/src/protos/generated/messages.rs index d91997b31..ba4fc2729 100644 --- a/rust/trezor-client/src/protos/generated/messages.rs +++ b/rust/trezor-client/src/protos/generated/messages.rs @@ -514,22 +514,22 @@ pub enum MessageType { MessageType_SolanaSignTx = 904, // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_SolanaTxSignature) MessageType_SolanaTxSignature = 905, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_StartPairingRequest) - MessageType_StartPairingRequest = 1000, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_StartPairingResponse) - MessageType_StartPairingResponse = 1001, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_CredentialRequest) - MessageType_CredentialRequest = 1002, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_CredentialResponse) - MessageType_CredentialResponse = 1003, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_EndRequest) - MessageType_EndRequest = 1004, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_EndResponse) - MessageType_EndResponse = 1005, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_CreateNewSession) - MessageType_CreateNewSession = 1006, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_NewSession) - MessageType_NewSession = 1007, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpStartPairingRequest) + MessageType_ThpStartPairingRequest = 1000, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpStartPairingResponse) + MessageType_ThpStartPairingResponse = 1001, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCredentialRequest) + MessageType_ThpCredentialRequest = 1002, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCredentialResponse) + MessageType_ThpCredentialResponse = 1003, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpEndRequest) + MessageType_ThpEndRequest = 1004, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpEndResponse) + MessageType_ThpEndResponse = 1005, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCreateNewSession) + MessageType_ThpCreateNewSession = 1006, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpNewSession) + MessageType_ThpNewSession = 1007, } impl ::protobuf::Enum for MessageType { @@ -784,14 +784,14 @@ impl ::protobuf::Enum for MessageType { 903 => ::std::option::Option::Some(MessageType::MessageType_SolanaAddress), 904 => ::std::option::Option::Some(MessageType::MessageType_SolanaSignTx), 905 => ::std::option::Option::Some(MessageType::MessageType_SolanaTxSignature), - 1000 => ::std::option::Option::Some(MessageType::MessageType_StartPairingRequest), - 1001 => ::std::option::Option::Some(MessageType::MessageType_StartPairingResponse), - 1002 => ::std::option::Option::Some(MessageType::MessageType_CredentialRequest), - 1003 => ::std::option::Option::Some(MessageType::MessageType_CredentialResponse), - 1004 => ::std::option::Option::Some(MessageType::MessageType_EndRequest), - 1005 => ::std::option::Option::Some(MessageType::MessageType_EndResponse), - 1006 => ::std::option::Option::Some(MessageType::MessageType_CreateNewSession), - 1007 => ::std::option::Option::Some(MessageType::MessageType_NewSession), + 1000 => ::std::option::Option::Some(MessageType::MessageType_ThpStartPairingRequest), + 1001 => ::std::option::Option::Some(MessageType::MessageType_ThpStartPairingResponse), + 1002 => ::std::option::Option::Some(MessageType::MessageType_ThpCredentialRequest), + 1003 => ::std::option::Option::Some(MessageType::MessageType_ThpCredentialResponse), + 1004 => ::std::option::Option::Some(MessageType::MessageType_ThpEndRequest), + 1005 => ::std::option::Option::Some(MessageType::MessageType_ThpEndResponse), + 1006 => ::std::option::Option::Some(MessageType::MessageType_ThpCreateNewSession), + 1007 => ::std::option::Option::Some(MessageType::MessageType_ThpNewSession), _ => ::std::option::Option::None } } @@ -1041,14 +1041,14 @@ impl ::protobuf::Enum for MessageType { "MessageType_SolanaAddress" => ::std::option::Option::Some(MessageType::MessageType_SolanaAddress), "MessageType_SolanaSignTx" => ::std::option::Option::Some(MessageType::MessageType_SolanaSignTx), "MessageType_SolanaTxSignature" => ::std::option::Option::Some(MessageType::MessageType_SolanaTxSignature), - "MessageType_StartPairingRequest" => ::std::option::Option::Some(MessageType::MessageType_StartPairingRequest), - "MessageType_StartPairingResponse" => ::std::option::Option::Some(MessageType::MessageType_StartPairingResponse), - "MessageType_CredentialRequest" => ::std::option::Option::Some(MessageType::MessageType_CredentialRequest), - "MessageType_CredentialResponse" => ::std::option::Option::Some(MessageType::MessageType_CredentialResponse), - "MessageType_EndRequest" => ::std::option::Option::Some(MessageType::MessageType_EndRequest), - "MessageType_EndResponse" => ::std::option::Option::Some(MessageType::MessageType_EndResponse), - "MessageType_CreateNewSession" => ::std::option::Option::Some(MessageType::MessageType_CreateNewSession), - "MessageType_NewSession" => ::std::option::Option::Some(MessageType::MessageType_NewSession), + "MessageType_ThpStartPairingRequest" => ::std::option::Option::Some(MessageType::MessageType_ThpStartPairingRequest), + "MessageType_ThpStartPairingResponse" => ::std::option::Option::Some(MessageType::MessageType_ThpStartPairingResponse), + "MessageType_ThpCredentialRequest" => ::std::option::Option::Some(MessageType::MessageType_ThpCredentialRequest), + "MessageType_ThpCredentialResponse" => ::std::option::Option::Some(MessageType::MessageType_ThpCredentialResponse), + "MessageType_ThpEndRequest" => ::std::option::Option::Some(MessageType::MessageType_ThpEndRequest), + "MessageType_ThpEndResponse" => ::std::option::Option::Some(MessageType::MessageType_ThpEndResponse), + "MessageType_ThpCreateNewSession" => ::std::option::Option::Some(MessageType::MessageType_ThpCreateNewSession), + "MessageType_ThpNewSession" => ::std::option::Option::Some(MessageType::MessageType_ThpNewSession), _ => ::std::option::Option::None } } @@ -1297,14 +1297,14 @@ impl ::protobuf::Enum for MessageType { MessageType::MessageType_SolanaAddress, MessageType::MessageType_SolanaSignTx, MessageType::MessageType_SolanaTxSignature, - MessageType::MessageType_StartPairingRequest, - MessageType::MessageType_StartPairingResponse, - MessageType::MessageType_CredentialRequest, - MessageType::MessageType_CredentialResponse, - MessageType::MessageType_EndRequest, - MessageType::MessageType_EndResponse, - MessageType::MessageType_CreateNewSession, - MessageType::MessageType_NewSession, + MessageType::MessageType_ThpStartPairingRequest, + MessageType::MessageType_ThpStartPairingResponse, + MessageType::MessageType_ThpCredentialRequest, + MessageType::MessageType_ThpCredentialResponse, + MessageType::MessageType_ThpEndRequest, + MessageType::MessageType_ThpEndResponse, + MessageType::MessageType_ThpCreateNewSession, + MessageType::MessageType_ThpNewSession, ]; } @@ -1559,14 +1559,14 @@ impl ::protobuf::EnumFull for MessageType { MessageType::MessageType_SolanaAddress => 240, MessageType::MessageType_SolanaSignTx => 241, MessageType::MessageType_SolanaTxSignature => 242, - MessageType::MessageType_StartPairingRequest => 243, - MessageType::MessageType_StartPairingResponse => 244, - MessageType::MessageType_CredentialRequest => 245, - MessageType::MessageType_CredentialResponse => 246, - MessageType::MessageType_EndRequest => 247, - MessageType::MessageType_EndResponse => 248, - MessageType::MessageType_CreateNewSession => 249, - MessageType::MessageType_NewSession => 250, + MessageType::MessageType_ThpStartPairingRequest => 243, + MessageType::MessageType_ThpStartPairingResponse => 244, + MessageType::MessageType_ThpCredentialRequest => 245, + MessageType::MessageType_ThpCredentialResponse => 246, + MessageType::MessageType_ThpEndRequest => 247, + MessageType::MessageType_ThpEndResponse => 248, + MessageType::MessageType_ThpCreateNewSession => 249, + MessageType::MessageType_ThpNewSession => 250, }; Self::enum_descriptor().value_by_index(index) } @@ -1616,7 +1616,7 @@ pub mod exts { static file_descriptor_proto_data: &'static [u8] = b"\ \n\x0emessages.proto\x12\x12hw.trezor.messages\x1a\x20google/protobuf/de\ - scriptor.proto*\xfbV\n\x0bMessageType\x12(\n\x16MessageType_Initialize\ + scriptor.proto*\x93W\n\x0bMessageType\x12(\n\x16MessageType_Initialize\ \x10\0\x1a\x0c\x80\xa6\x1d\x01\xb0\xb5\x18\x01\x90\xb5\x18\x01\x12\x1e\n\ \x10MessageType_Ping\x10\x01\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12\ %\n\x13MessageType_Success\x10\x02\x1a\x0c\x80\xa6\x1d\x01\xa8\xb5\x18\ @@ -1891,40 +1891,40 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x07\x1a\x04\x90\xb5\x18\x01\x12$\n\x19MessageType_SolanaAddress\x10\x87\ \x07\x1a\x04\x98\xb5\x18\x01\x12#\n\x18MessageType_SolanaSignTx\x10\x88\ \x07\x1a\x04\x90\xb5\x18\x01\x12(\n\x1dMessageType_SolanaTxSignature\x10\ - \x89\x07\x1a\x04\x98\xb5\x18\x01\x12.\n\x1fMessageType_StartPairingReque\ - st\x10\xe8\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12/\n\x20Message\ - Type_StartPairingResponse\x10\xe9\x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\ - \x18\x01\x12,\n\x1dMessageType_CredentialRequest\x10\xea\x07\x1a\x08\x80\ - \xa6\x1d\x01\x90\xb5\x18\x01\x12-\n\x1eMessageType_CredentialResponse\ - \x10\xeb\x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\x18\x01\x12%\n\x16MessageTy\ - pe_EndRequest\x10\xec\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12&\n\ - \x17MessageType_EndResponse\x10\xed\x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\ - \x18\x01\x12+\n\x1cMessageType_CreateNewSession\x10\xee\x07\x1a\x08\x80\ - \xa6\x1d\x01\x90\xb5\x18\x01\x12%\n\x16MessageType_NewSession\x10\xef\ - \x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\x18\x01\x1a\x04\xc8\xf3\x18\x01\"\ - \x04\x08Z\x10\\\"\x04\x08r\x10z\"\x06\x08\xdb\x01\x10\xdb\x01\"\x06\x08\ - \xe0\x01\x10\xe0\x01\"\x06\x08\xac\x02\x10\xb0\x02\"\x06\x08\xb5\x02\x10\ - \xb8\x02:<\n\x07wire_in\x18\xd2\x86\x03\x20\x01(\x08\x12!.google.protobu\ - f.EnumValueOptionsR\x06wireIn:>\n\x08wire_out\x18\xd3\x86\x03\x20\x01(\ - \x08\x12!.google.protobuf.EnumValueOptionsR\x07wireOut:G\n\rwire_debug_i\ - n\x18\xd4\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\ - \x0bwireDebugIn:I\n\x0ewire_debug_out\x18\xd5\x86\x03\x20\x01(\x08\x12!.\ - google.protobuf.EnumValueOptionsR\x0cwireDebugOut:@\n\twire_tiny\x18\xd6\ - \x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x08wireTiny\ - :L\n\x0fwire_bootloader\x18\xd7\x86\x03\x20\x01(\x08\x12!.google.protobu\ - f.EnumValueOptionsR\x0ewireBootloader:C\n\x0bwire_no_fsm\x18\xd8\x86\x03\ - \x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\twireNoFsm:F\n\x0cb\ - itcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueO\ - ptionsR\x0bbitcoinOnly:U\n\x17has_bitcoin_only_values\x18\xb9\x8e\x03\ - \x20\x01(\x08\x12\x1c.google.protobuf.EnumOptionsR\x14hasBitcoinOnlyValu\ - es:T\n\x14experimental_message\x18\xa1\x96\x03\x20\x01(\x08\x12\x1f.goog\ - le.protobuf.MessageOptionsR\x13experimentalMessage:>\n\twire_type\x18\ - \xa2\x96\x03\x20\x01(\r\x12\x1f.google.protobuf.MessageOptionsR\x08wireT\ - ype:N\n\x12experimental_field\x18\x89\x9e\x03\x20\x01(\x08\x12\x1d.googl\ - e.protobuf.FieldOptionsR\x11experimentalField:U\n\x17include_in_bitcoin_\ - only\x18\xe0\xd4\x03\x20\x01(\x08\x12\x1c.google.protobuf.FileOptionsR\ - \x14includeInBitcoinOnlyB8\n#com.satoshilabs.trezor.lib.protobufB\rTrezo\ - rMessage\x80\xa6\x1d\x01\ + \x89\x07\x1a\x04\x98\xb5\x18\x01\x121\n\"MessageType_ThpStartPairingRequ\ + est\x10\xe8\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x122\n#MessageTy\ + pe_ThpStartPairingResponse\x10\xe9\x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\ + \x18\x01\x12/\n\x20MessageType_ThpCredentialRequest\x10\xea\x07\x1a\x08\ + \x80\xa6\x1d\x01\x90\xb5\x18\x01\x120\n!MessageType_ThpCredentialRespons\ + e\x10\xeb\x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\x18\x01\x12(\n\x19MessageT\ + ype_ThpEndRequest\x10\xec\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\ + \x12)\n\x1aMessageType_ThpEndResponse\x10\xed\x07\x1a\x08\x80\xa6\x1d\ + \x01\x98\xb5\x18\x01\x12.\n\x1fMessageType_ThpCreateNewSession\x10\xee\ + \x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12(\n\x19MessageType_ThpNe\ + wSession\x10\xef\x07\x1a\x08\x80\xa6\x1d\x01\x98\xb5\x18\x01\x1a\x04\xc8\ + \xf3\x18\x01\"\x04\x08Z\x10\\\"\x04\x08r\x10z\"\x06\x08\xdb\x01\x10\xdb\ + \x01\"\x06\x08\xe0\x01\x10\xe0\x01\"\x06\x08\xac\x02\x10\xb0\x02\"\x06\ + \x08\xb5\x02\x10\xb8\x02:<\n\x07wire_in\x18\xd2\x86\x03\x20\x01(\x08\x12\ + !.google.protobuf.EnumValueOptionsR\x06wireIn:>\n\x08wire_out\x18\xd3\ + \x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x07wireOut:\ + G\n\rwire_debug_in\x18\xd4\x86\x03\x20\x01(\x08\x12!.google.protobuf.Enu\ + mValueOptionsR\x0bwireDebugIn:I\n\x0ewire_debug_out\x18\xd5\x86\x03\x20\ + \x01(\x08\x12!.google.protobuf.EnumValueOptionsR\x0cwireDebugOut:@\n\twi\ + re_tiny\x18\xd6\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptio\ + nsR\x08wireTiny:L\n\x0fwire_bootloader\x18\xd7\x86\x03\x20\x01(\x08\x12!\ + .google.protobuf.EnumValueOptionsR\x0ewireBootloader:C\n\x0bwire_no_fsm\ + \x18\xd8\x86\x03\x20\x01(\x08\x12!.google.protobuf.EnumValueOptionsR\twi\ + reNoFsm:F\n\x0cbitcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12!.google.pro\ + tobuf.EnumValueOptionsR\x0bbitcoinOnly:U\n\x17has_bitcoin_only_values\ + \x18\xb9\x8e\x03\x20\x01(\x08\x12\x1c.google.protobuf.EnumOptionsR\x14ha\ + sBitcoinOnlyValues:T\n\x14experimental_message\x18\xa1\x96\x03\x20\x01(\ + \x08\x12\x1f.google.protobuf.MessageOptionsR\x13experimentalMessage:>\n\ + \twire_type\x18\xa2\x96\x03\x20\x01(\r\x12\x1f.google.protobuf.MessageOp\ + tionsR\x08wireType:N\n\x12experimental_field\x18\x89\x9e\x03\x20\x01(\ + \x08\x12\x1d.google.protobuf.FieldOptionsR\x11experimentalField:U\n\x17i\ + nclude_in_bitcoin_only\x18\xe0\xd4\x03\x20\x01(\x08\x12\x1c.google.proto\ + buf.FileOptionsR\x14includeInBitcoinOnlyB8\n#com.satoshilabs.trezor.lib.\ + protobufB\rTrezorMessage\x80\xa6\x1d\x01\ "; /// `FileDescriptorProto` object which was a source for this generated file diff --git a/rust/trezor-client/src/protos/generated/messages_thp.rs b/rust/trezor-client/src/protos/generated/messages_thp.rs index eaca90070..9062e8eba 100644 --- a/rust/trezor-client/src/protos/generated/messages_thp.rs +++ b/rust/trezor-client/src/protos/generated/messages_thp.rs @@ -25,33 +25,33 @@ /// of protobuf runtime. const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_3_0; -// @@protoc_insertion_point(message:hw.trezor.messages.thp.DeviceProperties) +// @@protoc_insertion_point(message:hw.trezor.messages.thp.ThpDeviceProperties) #[derive(PartialEq,Clone,Default,Debug)] -pub struct DeviceProperties { +pub struct ThpDeviceProperties { // message fields - // @@protoc_insertion_point(field:hw.trezor.messages.thp.DeviceProperties.internal_model) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpDeviceProperties.internal_model) pub internal_model: ::std::option::Option<::std::string::String>, - // @@protoc_insertion_point(field:hw.trezor.messages.thp.DeviceProperties.model_variant) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpDeviceProperties.model_variant) pub model_variant: ::std::option::Option, - // @@protoc_insertion_point(field:hw.trezor.messages.thp.DeviceProperties.bootloader_mode) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpDeviceProperties.bootloader_mode) pub bootloader_mode: ::std::option::Option, - // @@protoc_insertion_point(field:hw.trezor.messages.thp.DeviceProperties.protocol_version) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpDeviceProperties.protocol_version) pub protocol_version: ::std::option::Option, - // @@protoc_insertion_point(field:hw.trezor.messages.thp.DeviceProperties.pairing_methods) - pub pairing_methods: ::std::vec::Vec<::protobuf::EnumOrUnknown>, + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpDeviceProperties.pairing_methods) + pub pairing_methods: ::std::vec::Vec<::protobuf::EnumOrUnknown>, // special fields - // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.DeviceProperties.special_fields) + // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.ThpDeviceProperties.special_fields) pub special_fields: ::protobuf::SpecialFields, } -impl<'a> ::std::default::Default for &'a DeviceProperties { - fn default() -> &'a DeviceProperties { - ::default_instance() +impl<'a> ::std::default::Default for &'a ThpDeviceProperties { + fn default() -> &'a ThpDeviceProperties { + ::default_instance() } } -impl DeviceProperties { - pub fn new() -> DeviceProperties { +impl ThpDeviceProperties { + pub fn new() -> ThpDeviceProperties { ::std::default::Default::default() } @@ -153,39 +153,39 @@ impl DeviceProperties { let mut oneofs = ::std::vec::Vec::with_capacity(0); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "internal_model", - |m: &DeviceProperties| { &m.internal_model }, - |m: &mut DeviceProperties| { &mut m.internal_model }, + |m: &ThpDeviceProperties| { &m.internal_model }, + |m: &mut ThpDeviceProperties| { &mut m.internal_model }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "model_variant", - |m: &DeviceProperties| { &m.model_variant }, - |m: &mut DeviceProperties| { &mut m.model_variant }, + |m: &ThpDeviceProperties| { &m.model_variant }, + |m: &mut ThpDeviceProperties| { &mut m.model_variant }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "bootloader_mode", - |m: &DeviceProperties| { &m.bootloader_mode }, - |m: &mut DeviceProperties| { &mut m.bootloader_mode }, + |m: &ThpDeviceProperties| { &m.bootloader_mode }, + |m: &mut ThpDeviceProperties| { &mut m.bootloader_mode }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "protocol_version", - |m: &DeviceProperties| { &m.protocol_version }, - |m: &mut DeviceProperties| { &mut m.protocol_version }, + |m: &ThpDeviceProperties| { &m.protocol_version }, + |m: &mut ThpDeviceProperties| { &mut m.protocol_version }, )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "pairing_methods", - |m: &DeviceProperties| { &m.pairing_methods }, - |m: &mut DeviceProperties| { &mut m.pairing_methods }, + |m: &ThpDeviceProperties| { &m.pairing_methods }, + |m: &mut ThpDeviceProperties| { &mut m.pairing_methods }, )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "DeviceProperties", + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "ThpDeviceProperties", fields, oneofs, ) } } -impl ::protobuf::Message for DeviceProperties { - const NAME: &'static str = "DeviceProperties"; +impl ::protobuf::Message for ThpDeviceProperties { + const NAME: &'static str = "ThpDeviceProperties"; fn is_initialized(&self) -> bool { true @@ -272,8 +272,8 @@ impl ::protobuf::Message for DeviceProperties { &mut self.special_fields } - fn new() -> DeviceProperties { - DeviceProperties::new() + fn new() -> ThpDeviceProperties { + ThpDeviceProperties::new() } fn clear(&mut self) { @@ -285,8 +285,8 @@ impl ::protobuf::Message for DeviceProperties { self.special_fields.clear(); } - fn default_instance() -> &'static DeviceProperties { - static instance: DeviceProperties = DeviceProperties { + fn default_instance() -> &'static ThpDeviceProperties { + static instance: ThpDeviceProperties = ThpDeviceProperties { internal_model: ::std::option::Option::None, model_variant: ::std::option::Option::None, bootloader_mode: ::std::option::Option::None, @@ -298,44 +298,44 @@ impl ::protobuf::Message for DeviceProperties { } } -impl ::protobuf::MessageFull for DeviceProperties { +impl ::protobuf::MessageFull for ThpDeviceProperties { fn descriptor() -> ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("DeviceProperties").unwrap()).clone() + descriptor.get(|| file_descriptor().message_by_package_relative_name("ThpDeviceProperties").unwrap()).clone() } } -impl ::std::fmt::Display for DeviceProperties { +impl ::std::fmt::Display for ThpDeviceProperties { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DeviceProperties { +impl ::protobuf::reflect::ProtobufValue for ThpDeviceProperties { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -// @@protoc_insertion_point(message:hw.trezor.messages.thp.HandshakeCompletionReqNoisePayload) +// @@protoc_insertion_point(message:hw.trezor.messages.thp.ThpHandshakeCompletionReqNoisePayload) #[derive(PartialEq,Clone,Default,Debug)] -pub struct HandshakeCompletionReqNoisePayload { +pub struct ThpHandshakeCompletionReqNoisePayload { // message fields - // @@protoc_insertion_point(field:hw.trezor.messages.thp.HandshakeCompletionReqNoisePayload.host_pairing_credential) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpHandshakeCompletionReqNoisePayload.host_pairing_credential) pub host_pairing_credential: ::std::option::Option<::std::vec::Vec>, - // @@protoc_insertion_point(field:hw.trezor.messages.thp.HandshakeCompletionReqNoisePayload.pairing_methods) - pub pairing_methods: ::std::vec::Vec<::protobuf::EnumOrUnknown>, + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpHandshakeCompletionReqNoisePayload.pairing_methods) + pub pairing_methods: ::std::vec::Vec<::protobuf::EnumOrUnknown>, // special fields - // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.HandshakeCompletionReqNoisePayload.special_fields) + // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.ThpHandshakeCompletionReqNoisePayload.special_fields) pub special_fields: ::protobuf::SpecialFields, } -impl<'a> ::std::default::Default for &'a HandshakeCompletionReqNoisePayload { - fn default() -> &'a HandshakeCompletionReqNoisePayload { - ::default_instance() +impl<'a> ::std::default::Default for &'a ThpHandshakeCompletionReqNoisePayload { + fn default() -> &'a ThpHandshakeCompletionReqNoisePayload { + ::default_instance() } } -impl HandshakeCompletionReqNoisePayload { - pub fn new() -> HandshakeCompletionReqNoisePayload { +impl ThpHandshakeCompletionReqNoisePayload { + pub fn new() -> ThpHandshakeCompletionReqNoisePayload { ::std::default::Default::default() } @@ -380,24 +380,24 @@ impl HandshakeCompletionReqNoisePayload { let mut oneofs = ::std::vec::Vec::with_capacity(0); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "host_pairing_credential", - |m: &HandshakeCompletionReqNoisePayload| { &m.host_pairing_credential }, - |m: &mut HandshakeCompletionReqNoisePayload| { &mut m.host_pairing_credential }, + |m: &ThpHandshakeCompletionReqNoisePayload| { &m.host_pairing_credential }, + |m: &mut ThpHandshakeCompletionReqNoisePayload| { &mut m.host_pairing_credential }, )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "pairing_methods", - |m: &HandshakeCompletionReqNoisePayload| { &m.pairing_methods }, - |m: &mut HandshakeCompletionReqNoisePayload| { &mut m.pairing_methods }, + |m: &ThpHandshakeCompletionReqNoisePayload| { &m.pairing_methods }, + |m: &mut ThpHandshakeCompletionReqNoisePayload| { &mut m.pairing_methods }, )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "HandshakeCompletionReqNoisePayload", + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "ThpHandshakeCompletionReqNoisePayload", fields, oneofs, ) } } -impl ::protobuf::Message for HandshakeCompletionReqNoisePayload { - const NAME: &'static str = "HandshakeCompletionReqNoisePayload"; +impl ::protobuf::Message for ThpHandshakeCompletionReqNoisePayload { + const NAME: &'static str = "ThpHandshakeCompletionReqNoisePayload"; fn is_initialized(&self) -> bool { true @@ -457,8 +457,8 @@ impl ::protobuf::Message for HandshakeCompletionReqNoisePayload { &mut self.special_fields } - fn new() -> HandshakeCompletionReqNoisePayload { - HandshakeCompletionReqNoisePayload::new() + fn new() -> ThpHandshakeCompletionReqNoisePayload { + ThpHandshakeCompletionReqNoisePayload::new() } fn clear(&mut self) { @@ -467,8 +467,8 @@ impl ::protobuf::Message for HandshakeCompletionReqNoisePayload { self.special_fields.clear(); } - fn default_instance() -> &'static HandshakeCompletionReqNoisePayload { - static instance: HandshakeCompletionReqNoisePayload = HandshakeCompletionReqNoisePayload { + fn default_instance() -> &'static ThpHandshakeCompletionReqNoisePayload { + static instance: ThpHandshakeCompletionReqNoisePayload = ThpHandshakeCompletionReqNoisePayload { host_pairing_credential: ::std::option::Option::None, pairing_methods: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), @@ -477,44 +477,44 @@ impl ::protobuf::Message for HandshakeCompletionReqNoisePayload { } } -impl ::protobuf::MessageFull for HandshakeCompletionReqNoisePayload { +impl ::protobuf::MessageFull for ThpHandshakeCompletionReqNoisePayload { fn descriptor() -> ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("HandshakeCompletionReqNoisePayload").unwrap()).clone() + descriptor.get(|| file_descriptor().message_by_package_relative_name("ThpHandshakeCompletionReqNoisePayload").unwrap()).clone() } } -impl ::std::fmt::Display for HandshakeCompletionReqNoisePayload { +impl ::std::fmt::Display for ThpHandshakeCompletionReqNoisePayload { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for HandshakeCompletionReqNoisePayload { +impl ::protobuf::reflect::ProtobufValue for ThpHandshakeCompletionReqNoisePayload { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -// @@protoc_insertion_point(message:hw.trezor.messages.thp.CreateNewSession) +// @@protoc_insertion_point(message:hw.trezor.messages.thp.ThpCreateNewSession) #[derive(PartialEq,Clone,Default,Debug)] -pub struct CreateNewSession { +pub struct ThpCreateNewSession { // message fields - // @@protoc_insertion_point(field:hw.trezor.messages.thp.CreateNewSession.passphrase) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpCreateNewSession.passphrase) pub passphrase: ::std::option::Option<::std::string::String>, - // @@protoc_insertion_point(field:hw.trezor.messages.thp.CreateNewSession.on_device) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpCreateNewSession.on_device) pub on_device: ::std::option::Option, // special fields - // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.CreateNewSession.special_fields) + // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.ThpCreateNewSession.special_fields) pub special_fields: ::protobuf::SpecialFields, } -impl<'a> ::std::default::Default for &'a CreateNewSession { - fn default() -> &'a CreateNewSession { - ::default_instance() +impl<'a> ::std::default::Default for &'a ThpCreateNewSession { + fn default() -> &'a ThpCreateNewSession { + ::default_instance() } } -impl CreateNewSession { - pub fn new() -> CreateNewSession { +impl ThpCreateNewSession { + pub fn new() -> ThpCreateNewSession { ::std::default::Default::default() } @@ -578,24 +578,24 @@ impl CreateNewSession { let mut oneofs = ::std::vec::Vec::with_capacity(0); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "passphrase", - |m: &CreateNewSession| { &m.passphrase }, - |m: &mut CreateNewSession| { &mut m.passphrase }, + |m: &ThpCreateNewSession| { &m.passphrase }, + |m: &mut ThpCreateNewSession| { &mut m.passphrase }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "on_device", - |m: &CreateNewSession| { &m.on_device }, - |m: &mut CreateNewSession| { &mut m.on_device }, + |m: &ThpCreateNewSession| { &m.on_device }, + |m: &mut ThpCreateNewSession| { &mut m.on_device }, )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "CreateNewSession", + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "ThpCreateNewSession", fields, oneofs, ) } } -impl ::protobuf::Message for CreateNewSession { - const NAME: &'static str = "CreateNewSession"; +impl ::protobuf::Message for ThpCreateNewSession { + const NAME: &'static str = "ThpCreateNewSession"; fn is_initialized(&self) -> bool { true @@ -652,8 +652,8 @@ impl ::protobuf::Message for CreateNewSession { &mut self.special_fields } - fn new() -> CreateNewSession { - CreateNewSession::new() + fn new() -> ThpCreateNewSession { + ThpCreateNewSession::new() } fn clear(&mut self) { @@ -662,8 +662,8 @@ impl ::protobuf::Message for CreateNewSession { self.special_fields.clear(); } - fn default_instance() -> &'static CreateNewSession { - static instance: CreateNewSession = CreateNewSession { + fn default_instance() -> &'static ThpCreateNewSession { + static instance: ThpCreateNewSession = ThpCreateNewSession { passphrase: ::std::option::Option::None, on_device: ::std::option::Option::None, special_fields: ::protobuf::SpecialFields::new(), @@ -672,42 +672,42 @@ impl ::protobuf::Message for CreateNewSession { } } -impl ::protobuf::MessageFull for CreateNewSession { +impl ::protobuf::MessageFull for ThpCreateNewSession { fn descriptor() -> ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("CreateNewSession").unwrap()).clone() + descriptor.get(|| file_descriptor().message_by_package_relative_name("ThpCreateNewSession").unwrap()).clone() } } -impl ::std::fmt::Display for CreateNewSession { +impl ::std::fmt::Display for ThpCreateNewSession { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for CreateNewSession { +impl ::protobuf::reflect::ProtobufValue for ThpCreateNewSession { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } -// @@protoc_insertion_point(message:hw.trezor.messages.thp.NewSession) +// @@protoc_insertion_point(message:hw.trezor.messages.thp.ThpNewSession) #[derive(PartialEq,Clone,Default,Debug)] -pub struct NewSession { +pub struct ThpNewSession { // message fields - // @@protoc_insertion_point(field:hw.trezor.messages.thp.NewSession.new_session_id) + // @@protoc_insertion_point(field:hw.trezor.messages.thp.ThpNewSession.new_session_id) pub new_session_id: ::std::option::Option, // special fields - // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.NewSession.special_fields) + // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.ThpNewSession.special_fields) pub special_fields: ::protobuf::SpecialFields, } -impl<'a> ::std::default::Default for &'a NewSession { - fn default() -> &'a NewSession { - ::default_instance() +impl<'a> ::std::default::Default for &'a ThpNewSession { + fn default() -> &'a ThpNewSession { + ::default_instance() } } -impl NewSession { - pub fn new() -> NewSession { +impl ThpNewSession { + pub fn new() -> ThpNewSession { ::std::default::Default::default() } @@ -735,19 +735,19 @@ impl NewSession { let mut oneofs = ::std::vec::Vec::with_capacity(0); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "new_session_id", - |m: &NewSession| { &m.new_session_id }, - |m: &mut NewSession| { &mut m.new_session_id }, + |m: &ThpNewSession| { &m.new_session_id }, + |m: &mut ThpNewSession| { &mut m.new_session_id }, )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "NewSession", + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "ThpNewSession", fields, oneofs, ) } } -impl ::protobuf::Message for NewSession { - const NAME: &'static str = "NewSession"; +impl ::protobuf::Message for ThpNewSession { + const NAME: &'static str = "ThpNewSession"; fn is_initialized(&self) -> bool { true @@ -795,8 +795,8 @@ impl ::protobuf::Message for NewSession { &mut self.special_fields } - fn new() -> NewSession { - NewSession::new() + fn new() -> ThpNewSession { + ThpNewSession::new() } fn clear(&mut self) { @@ -804,8 +804,8 @@ impl ::protobuf::Message for NewSession { self.special_fields.clear(); } - fn default_instance() -> &'static NewSession { - static instance: NewSession = NewSession { + fn default_instance() -> &'static ThpNewSession { + static instance: ThpNewSession = ThpNewSession { new_session_id: ::std::option::Option::None, special_fields: ::protobuf::SpecialFields::new(), }; @@ -813,119 +813,119 @@ impl ::protobuf::Message for NewSession { } } -impl ::protobuf::MessageFull for NewSession { +impl ::protobuf::MessageFull for ThpNewSession { fn descriptor() -> ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("NewSession").unwrap()).clone() + descriptor.get(|| file_descriptor().message_by_package_relative_name("ThpNewSession").unwrap()).clone() } } -impl ::std::fmt::Display for NewSession { +impl ::std::fmt::Display for ThpNewSession { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for NewSession { +impl ::protobuf::reflect::ProtobufValue for ThpNewSession { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } #[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)] -// @@protoc_insertion_point(enum:hw.trezor.messages.thp.PairingMethod) -pub enum PairingMethod { - // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.PairingMethod.PairingMethod_NoMethod) +// @@protoc_insertion_point(enum:hw.trezor.messages.thp.ThpPairingMethod) +pub enum ThpPairingMethod { + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpPairingMethod.PairingMethod_NoMethod) PairingMethod_NoMethod = 1, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.PairingMethod.PairingMethod_CodeEntry) + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpPairingMethod.PairingMethod_CodeEntry) PairingMethod_CodeEntry = 2, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.PairingMethod.PairingMethod_QrCode) + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpPairingMethod.PairingMethod_QrCode) PairingMethod_QrCode = 3, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.PairingMethod.PairingMethod_NFC_Unidirectional) + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpPairingMethod.PairingMethod_NFC_Unidirectional) PairingMethod_NFC_Unidirectional = 4, } -impl ::protobuf::Enum for PairingMethod { - const NAME: &'static str = "PairingMethod"; +impl ::protobuf::Enum for ThpPairingMethod { + const NAME: &'static str = "ThpPairingMethod"; fn value(&self) -> i32 { *self as i32 } - fn from_i32(value: i32) -> ::std::option::Option { + fn from_i32(value: i32) -> ::std::option::Option { match value { - 1 => ::std::option::Option::Some(PairingMethod::PairingMethod_NoMethod), - 2 => ::std::option::Option::Some(PairingMethod::PairingMethod_CodeEntry), - 3 => ::std::option::Option::Some(PairingMethod::PairingMethod_QrCode), - 4 => ::std::option::Option::Some(PairingMethod::PairingMethod_NFC_Unidirectional), + 1 => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_NoMethod), + 2 => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_CodeEntry), + 3 => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_QrCode), + 4 => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_NFC_Unidirectional), _ => ::std::option::Option::None } } - fn from_str(str: &str) -> ::std::option::Option { + fn from_str(str: &str) -> ::std::option::Option { match str { - "PairingMethod_NoMethod" => ::std::option::Option::Some(PairingMethod::PairingMethod_NoMethod), - "PairingMethod_CodeEntry" => ::std::option::Option::Some(PairingMethod::PairingMethod_CodeEntry), - "PairingMethod_QrCode" => ::std::option::Option::Some(PairingMethod::PairingMethod_QrCode), - "PairingMethod_NFC_Unidirectional" => ::std::option::Option::Some(PairingMethod::PairingMethod_NFC_Unidirectional), + "PairingMethod_NoMethod" => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_NoMethod), + "PairingMethod_CodeEntry" => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_CodeEntry), + "PairingMethod_QrCode" => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_QrCode), + "PairingMethod_NFC_Unidirectional" => ::std::option::Option::Some(ThpPairingMethod::PairingMethod_NFC_Unidirectional), _ => ::std::option::Option::None } } - const VALUES: &'static [PairingMethod] = &[ - PairingMethod::PairingMethod_NoMethod, - PairingMethod::PairingMethod_CodeEntry, - PairingMethod::PairingMethod_QrCode, - PairingMethod::PairingMethod_NFC_Unidirectional, + const VALUES: &'static [ThpPairingMethod] = &[ + ThpPairingMethod::PairingMethod_NoMethod, + ThpPairingMethod::PairingMethod_CodeEntry, + ThpPairingMethod::PairingMethod_QrCode, + ThpPairingMethod::PairingMethod_NFC_Unidirectional, ]; } -impl ::protobuf::EnumFull for PairingMethod { +impl ::protobuf::EnumFull for ThpPairingMethod { fn enum_descriptor() -> ::protobuf::reflect::EnumDescriptor { static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().enum_by_package_relative_name("PairingMethod").unwrap()).clone() + descriptor.get(|| file_descriptor().enum_by_package_relative_name("ThpPairingMethod").unwrap()).clone() } fn descriptor(&self) -> ::protobuf::reflect::EnumValueDescriptor { let index = match self { - PairingMethod::PairingMethod_NoMethod => 0, - PairingMethod::PairingMethod_CodeEntry => 1, - PairingMethod::PairingMethod_QrCode => 2, - PairingMethod::PairingMethod_NFC_Unidirectional => 3, + ThpPairingMethod::PairingMethod_NoMethod => 0, + ThpPairingMethod::PairingMethod_CodeEntry => 1, + ThpPairingMethod::PairingMethod_QrCode => 2, + ThpPairingMethod::PairingMethod_NFC_Unidirectional => 3, }; Self::enum_descriptor().value_by_index(index) } } // Note, `Default` is implemented although default value is not 0 -impl ::std::default::Default for PairingMethod { +impl ::std::default::Default for ThpPairingMethod { fn default() -> Self { - PairingMethod::PairingMethod_NoMethod + ThpPairingMethod::PairingMethod_NoMethod } } -impl PairingMethod { +impl ThpPairingMethod { fn generated_enum_descriptor_data() -> ::protobuf::reflect::GeneratedEnumDescriptorData { - ::protobuf::reflect::GeneratedEnumDescriptorData::new::("PairingMethod") + ::protobuf::reflect::GeneratedEnumDescriptorData::new::("ThpPairingMethod") } } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x12messages-thp.proto\x12\x16hw.trezor.messages.thp\"\x82\x02\n\x10De\ - viceProperties\x12%\n\x0einternal_model\x18\x01\x20\x01(\tR\rinternalMod\ - el\x12#\n\rmodel_variant\x18\x02\x20\x01(\rR\x0cmodelVariant\x12'\n\x0fb\ - ootloader_mode\x18\x03\x20\x01(\x08R\x0ebootloaderMode\x12)\n\x10protoco\ - l_version\x18\x04\x20\x01(\rR\x0fprotocolVersion\x12N\n\x0fpairing_metho\ - ds\x18\x05\x20\x03(\x0e2%.hw.trezor.messages.thp.PairingMethodR\x0epairi\ - ngMethods\"\xac\x01\n\"HandshakeCompletionReqNoisePayload\x126\n\x17host\ - _pairing_credential\x18\x01\x20\x01(\x0cR\x15hostPairingCredential\x12N\ - \n\x0fpairing_methods\x18\x02\x20\x03(\x0e2%.hw.trezor.messages.thp.Pair\ - ingMethodR\x0epairingMethods\"O\n\x10CreateNewSession\x12\x1e\n\npassphr\ - ase\x18\x01\x20\x01(\tR\npassphrase\x12\x1b\n\ton_device\x18\x02\x20\x01\ - (\x08R\x08onDevice\"2\n\nNewSession\x12$\n\x0enew_session_id\x18\x01\x20\ - \x01(\rR\x0cnewSessionId*\x88\x01\n\rPairingMethod\x12\x1a\n\x16PairingM\ - ethod_NoMethod\x10\x01\x12\x1b\n\x17PairingMethod_CodeEntry\x10\x02\x12\ - \x18\n\x14PairingMethod_QrCode\x10\x03\x12$\n\x20PairingMethod_NFC_Unidi\ - rectional\x10\x04B7\n#com.satoshilabs.trezor.lib.protobufB\x10TrezorMess\ - ageThp\ + \n\x12messages-thp.proto\x12\x16hw.trezor.messages.thp\"\x88\x02\n\x13Th\ + pDeviceProperties\x12%\n\x0einternal_model\x18\x01\x20\x01(\tR\rinternal\ + Model\x12#\n\rmodel_variant\x18\x02\x20\x01(\rR\x0cmodelVariant\x12'\n\ + \x0fbootloader_mode\x18\x03\x20\x01(\x08R\x0ebootloaderMode\x12)\n\x10pr\ + otocol_version\x18\x04\x20\x01(\rR\x0fprotocolVersion\x12Q\n\x0fpairing_\ + methods\x18\x05\x20\x03(\x0e2(.hw.trezor.messages.thp.ThpPairingMethodR\ + \x0epairingMethods\"\xb2\x01\n%ThpHandshakeCompletionReqNoisePayload\x12\ + 6\n\x17host_pairing_credential\x18\x01\x20\x01(\x0cR\x15hostPairingCrede\ + ntial\x12Q\n\x0fpairing_methods\x18\x02\x20\x03(\x0e2(.hw.trezor.message\ + s.thp.ThpPairingMethodR\x0epairingMethods\"R\n\x13ThpCreateNewSession\ + \x12\x1e\n\npassphrase\x18\x01\x20\x01(\tR\npassphrase\x12\x1b\n\ton_dev\ + ice\x18\x02\x20\x01(\x08R\x08onDevice\"5\n\rThpNewSession\x12$\n\x0enew_\ + session_id\x18\x01\x20\x01(\rR\x0cnewSessionId*\x8b\x01\n\x10ThpPairingM\ + ethod\x12\x1a\n\x16PairingMethod_NoMethod\x10\x01\x12\x1b\n\x17PairingMe\ + thod_CodeEntry\x10\x02\x12\x18\n\x14PairingMethod_QrCode\x10\x03\x12$\n\ + \x20PairingMethod_NFC_Unidirectional\x10\x04B7\n#com.satoshilabs.trezor.\ + lib.protobufB\x10TrezorMessageThp\ "; /// `FileDescriptorProto` object which was a source for this generated file @@ -944,12 +944,12 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { let generated_file_descriptor = generated_file_descriptor_lazy.get(|| { let mut deps = ::std::vec::Vec::with_capacity(0); let mut messages = ::std::vec::Vec::with_capacity(4); - messages.push(DeviceProperties::generated_message_descriptor_data()); - messages.push(HandshakeCompletionReqNoisePayload::generated_message_descriptor_data()); - messages.push(CreateNewSession::generated_message_descriptor_data()); - messages.push(NewSession::generated_message_descriptor_data()); + messages.push(ThpDeviceProperties::generated_message_descriptor_data()); + messages.push(ThpHandshakeCompletionReqNoisePayload::generated_message_descriptor_data()); + messages.push(ThpCreateNewSession::generated_message_descriptor_data()); + messages.push(ThpNewSession::generated_message_descriptor_data()); let mut enums = ::std::vec::Vec::with_capacity(1); - enums.push(PairingMethod::generated_enum_descriptor_data()); + enums.push(ThpPairingMethod::generated_enum_descriptor_data()); ::protobuf::reflect::GeneratedFileDescriptor::new_generated( file_descriptor_proto(), deps,