From 99e9eb8f42a402376d2554c6e893bc00d6ca9689 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 18 Jun 2025 01:41:56 +0200 Subject: [PATCH] refactor(common/protob): split ThpMessageType off MessageType [no changelog] --- core/src/trezor/enums/MessageType.py | 19 -- core/src/trezor/enums/__init__.py | 38 +-- core/src/trezor/messages.py | 1 + python/src/trezorlib/messages.py | 39 +-- rust/trezor-client/src/messages/generated.rs | 18 -- .../src/protos/generated/messages.rs | 173 ++---------- .../src/protos/generated/messages_thp.rs | 267 +++++++++++++++--- 7 files changed, 295 insertions(+), 260 deletions(-) diff --git a/core/src/trezor/enums/MessageType.py b/core/src/trezor/enums/MessageType.py index 6b88a362c3..23868c4e44 100644 --- a/core/src/trezor/enums/MessageType.py +++ b/core/src/trezor/enums/MessageType.py @@ -107,25 +107,6 @@ if __debug__: DebugLinkGcInfo = 9010 DebugLinkGetPairingInfo = 9011 DebugLinkPairingInfo = 9012 -if utils.USE_THP: - ThpCreateNewSession = 1000 - ThpPairingRequest = 1006 - ThpPairingRequestApproved = 1007 - ThpSelectMethod = 1008 - ThpPairingPreparationsFinished = 1009 - ThpCredentialRequest = 1010 - ThpCredentialResponse = 1011 - ThpEndRequest = 1012 - ThpEndResponse = 1013 - ThpCodeEntryCommitment = 1016 - ThpCodeEntryChallenge = 1017 - ThpCodeEntryCpaceTrezor = 1018 - ThpCodeEntryCpaceHostTag = 1019 - ThpCodeEntrySecret = 1020 - ThpQrCodeTag = 1024 - ThpQrCodeSecret = 1025 - ThpNfcTagHost = 1032 - ThpNfcTagTrezor = 1033 if not utils.BITCOIN_ONLY: SetU2FCounter = 63 GetNextU2FCounter = 80 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index 51a73c5c99..649d06cfce 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -337,6 +337,26 @@ if TYPE_CHECKING: Nay = 1 Pass = 2 + class ThpMessageType(IntEnum): + ThpCreateNewSession = 1000 + ThpPairingRequest = 1006 + ThpPairingRequestApproved = 1007 + ThpSelectMethod = 1008 + ThpPairingPreparationsFinished = 1009 + ThpCredentialRequest = 1010 + ThpCredentialResponse = 1011 + ThpEndRequest = 1012 + ThpEndResponse = 1013 + ThpCodeEntryCommitment = 1016 + ThpCodeEntryChallenge = 1017 + ThpCodeEntryCpaceTrezor = 1018 + ThpCodeEntryCpaceHostTag = 1019 + ThpCodeEntrySecret = 1020 + ThpQrCodeTag = 1024 + ThpQrCodeSecret = 1025 + ThpNfcTagHost = 1032 + ThpNfcTagTrezor = 1033 + class ThpPairingMethod(IntEnum): SkipPairing = 1 CodeEntry = 2 @@ -582,24 +602,6 @@ if TYPE_CHECKING: SolanaAddress = 903 SolanaSignTx = 904 SolanaTxSignature = 905 - ThpCreateNewSession = 1000 - ThpPairingRequest = 1006 - ThpPairingRequestApproved = 1007 - ThpSelectMethod = 1008 - ThpPairingPreparationsFinished = 1009 - ThpCredentialRequest = 1010 - ThpCredentialResponse = 1011 - ThpEndRequest = 1012 - ThpEndResponse = 1013 - ThpCodeEntryCommitment = 1016 - ThpCodeEntryChallenge = 1017 - ThpCodeEntryCpaceTrezor = 1018 - ThpCodeEntryCpaceHostTag = 1019 - ThpCodeEntrySecret = 1020 - ThpQrCodeTag = 1024 - ThpQrCodeSecret = 1025 - ThpNfcTagHost = 1032 - ThpNfcTagTrezor = 1033 NostrGetPubkey = 2001 NostrPubkey = 2002 NostrSignEvent = 2003 diff --git a/core/src/trezor/messages.py b/core/src/trezor/messages.py index 4e171878fb..4994581c28 100644 --- a/core/src/trezor/messages.py +++ b/core/src/trezor/messages.py @@ -65,6 +65,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 ThpMessageType # noqa: F401 from trezor.enums import ThpPairingMethod # noqa: F401 from trezor.enums import WordRequestType # noqa: F401 diff --git a/python/src/trezorlib/messages.py b/python/src/trezorlib/messages.py index cd020f2a97..85192c2273 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -387,6 +387,27 @@ class TezosBallotType(IntEnum): Pass = 2 +class ThpMessageType(IntEnum): + ThpCreateNewSession = 1000 + ThpPairingRequest = 1006 + ThpPairingRequestApproved = 1007 + ThpSelectMethod = 1008 + ThpPairingPreparationsFinished = 1009 + ThpCredentialRequest = 1010 + ThpCredentialResponse = 1011 + ThpEndRequest = 1012 + ThpEndResponse = 1013 + ThpCodeEntryCommitment = 1016 + ThpCodeEntryChallenge = 1017 + ThpCodeEntryCpaceTrezor = 1018 + ThpCodeEntryCpaceHostTag = 1019 + ThpCodeEntrySecret = 1020 + ThpQrCodeTag = 1024 + ThpQrCodeSecret = 1025 + ThpNfcTagHost = 1032 + ThpNfcTagTrezor = 1033 + + class ThpPairingMethod(IntEnum): SkipPairing = 1 CodeEntry = 2 @@ -633,24 +654,6 @@ class MessageType(IntEnum): SolanaAddress = 903 SolanaSignTx = 904 SolanaTxSignature = 905 - ThpCreateNewSession = 1000 - ThpPairingRequest = 1006 - ThpPairingRequestApproved = 1007 - ThpSelectMethod = 1008 - ThpPairingPreparationsFinished = 1009 - ThpCredentialRequest = 1010 - ThpCredentialResponse = 1011 - ThpEndRequest = 1012 - ThpEndResponse = 1013 - ThpCodeEntryCommitment = 1016 - ThpCodeEntryChallenge = 1017 - ThpCodeEntryCpaceTrezor = 1018 - ThpCodeEntryCpaceHostTag = 1019 - ThpCodeEntrySecret = 1020 - ThpQrCodeTag = 1024 - ThpQrCodeSecret = 1025 - ThpNfcTagHost = 1032 - ThpNfcTagTrezor = 1033 NostrGetPubkey = 2001 NostrPubkey = 2002 NostrSignEvent = 2003 diff --git a/rust/trezor-client/src/messages/generated.rs b/rust/trezor-client/src/messages/generated.rs index 24e4b08553..450cdbb1d5 100644 --- a/rust/trezor-client/src/messages/generated.rs +++ b/rust/trezor-client/src/messages/generated.rs @@ -87,24 +87,6 @@ trezor_message_impl! { DebugLinkGcInfo => MessageType_DebugLinkGcInfo, DebugLinkGetPairingInfo => MessageType_DebugLinkGetPairingInfo, DebugLinkPairingInfo => MessageType_DebugLinkPairingInfo, - ThpCreateNewSession => MessageType_ThpCreateNewSession, - ThpPairingRequest => MessageType_ThpPairingRequest, - ThpPairingRequestApproved => MessageType_ThpPairingRequestApproved, - ThpSelectMethod => MessageType_ThpSelectMethod, - ThpPairingPreparationsFinished => MessageType_ThpPairingPreparationsFinished, - ThpCredentialRequest => MessageType_ThpCredentialRequest, - ThpCredentialResponse => MessageType_ThpCredentialResponse, - ThpEndRequest => MessageType_ThpEndRequest, - ThpEndResponse => MessageType_ThpEndResponse, - ThpCodeEntryCommitment => MessageType_ThpCodeEntryCommitment, - ThpCodeEntryChallenge => MessageType_ThpCodeEntryChallenge, - ThpCodeEntryCpaceTrezor => MessageType_ThpCodeEntryCpaceTrezor, - ThpCodeEntryCpaceHostTag => MessageType_ThpCodeEntryCpaceHostTag, - ThpCodeEntrySecret => MessageType_ThpCodeEntrySecret, - ThpQrCodeTag => MessageType_ThpQrCodeTag, - ThpQrCodeSecret => MessageType_ThpQrCodeSecret, - ThpNfcTagHost => MessageType_ThpNfcTagHost, - ThpNfcTagTrezor => MessageType_ThpNfcTagTrezor, BenchmarkListNames => MessageType_BenchmarkListNames, BenchmarkNames => MessageType_BenchmarkNames, BenchmarkRun => MessageType_BenchmarkRun, diff --git a/rust/trezor-client/src/protos/generated/messages.rs b/rust/trezor-client/src/protos/generated/messages.rs index 710aa04f2e..ab51acb7c8 100644 --- a/rust/trezor-client/src/protos/generated/messages.rs +++ b/rust/trezor-client/src/protos/generated/messages.rs @@ -503,42 +503,6 @@ 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_ThpCreateNewSession) - MessageType_ThpCreateNewSession = 1000, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpPairingRequest) - MessageType_ThpPairingRequest = 1006, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpPairingRequestApproved) - MessageType_ThpPairingRequestApproved = 1007, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpSelectMethod) - MessageType_ThpSelectMethod = 1008, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpPairingPreparationsFinished) - MessageType_ThpPairingPreparationsFinished = 1009, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCredentialRequest) - MessageType_ThpCredentialRequest = 1010, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCredentialResponse) - MessageType_ThpCredentialResponse = 1011, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpEndRequest) - MessageType_ThpEndRequest = 1012, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpEndResponse) - MessageType_ThpEndResponse = 1013, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCodeEntryCommitment) - MessageType_ThpCodeEntryCommitment = 1016, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCodeEntryChallenge) - MessageType_ThpCodeEntryChallenge = 1017, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCodeEntryCpaceTrezor) - MessageType_ThpCodeEntryCpaceTrezor = 1018, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCodeEntryCpaceHostTag) - MessageType_ThpCodeEntryCpaceHostTag = 1019, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpCodeEntrySecret) - MessageType_ThpCodeEntrySecret = 1020, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpQrCodeTag) - MessageType_ThpQrCodeTag = 1024, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpQrCodeSecret) - MessageType_ThpQrCodeSecret = 1025, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpNfcTagHost) - MessageType_ThpNfcTagHost = 1032, - // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_ThpNfcTagTrezor) - MessageType_ThpNfcTagTrezor = 1033, // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_NostrGetPubkey) MessageType_NostrGetPubkey = 2001, // @@protoc_insertion_point(enum_value:hw.trezor.messages.MessageType.MessageType_NostrPubkey) @@ -804,24 +768,6 @@ 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_ThpCreateNewSession), - 1006 => ::std::option::Option::Some(MessageType::MessageType_ThpPairingRequest), - 1007 => ::std::option::Option::Some(MessageType::MessageType_ThpPairingRequestApproved), - 1008 => ::std::option::Option::Some(MessageType::MessageType_ThpSelectMethod), - 1009 => ::std::option::Option::Some(MessageType::MessageType_ThpPairingPreparationsFinished), - 1010 => ::std::option::Option::Some(MessageType::MessageType_ThpCredentialRequest), - 1011 => ::std::option::Option::Some(MessageType::MessageType_ThpCredentialResponse), - 1012 => ::std::option::Option::Some(MessageType::MessageType_ThpEndRequest), - 1013 => ::std::option::Option::Some(MessageType::MessageType_ThpEndResponse), - 1016 => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryCommitment), - 1017 => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryChallenge), - 1018 => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryCpaceTrezor), - 1019 => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryCpaceHostTag), - 1020 => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntrySecret), - 1024 => ::std::option::Option::Some(MessageType::MessageType_ThpQrCodeTag), - 1025 => ::std::option::Option::Some(MessageType::MessageType_ThpQrCodeSecret), - 1032 => ::std::option::Option::Some(MessageType::MessageType_ThpNfcTagHost), - 1033 => ::std::option::Option::Some(MessageType::MessageType_ThpNfcTagTrezor), 2001 => ::std::option::Option::Some(MessageType::MessageType_NostrGetPubkey), 2002 => ::std::option::Option::Some(MessageType::MessageType_NostrPubkey), 2003 => ::std::option::Option::Some(MessageType::MessageType_NostrSignEvent), @@ -1074,24 +1020,6 @@ 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_ThpCreateNewSession" => ::std::option::Option::Some(MessageType::MessageType_ThpCreateNewSession), - "MessageType_ThpPairingRequest" => ::std::option::Option::Some(MessageType::MessageType_ThpPairingRequest), - "MessageType_ThpPairingRequestApproved" => ::std::option::Option::Some(MessageType::MessageType_ThpPairingRequestApproved), - "MessageType_ThpSelectMethod" => ::std::option::Option::Some(MessageType::MessageType_ThpSelectMethod), - "MessageType_ThpPairingPreparationsFinished" => ::std::option::Option::Some(MessageType::MessageType_ThpPairingPreparationsFinished), - "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_ThpCodeEntryCommitment" => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryCommitment), - "MessageType_ThpCodeEntryChallenge" => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryChallenge), - "MessageType_ThpCodeEntryCpaceTrezor" => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryCpaceTrezor), - "MessageType_ThpCodeEntryCpaceHostTag" => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntryCpaceHostTag), - "MessageType_ThpCodeEntrySecret" => ::std::option::Option::Some(MessageType::MessageType_ThpCodeEntrySecret), - "MessageType_ThpQrCodeTag" => ::std::option::Option::Some(MessageType::MessageType_ThpQrCodeTag), - "MessageType_ThpQrCodeSecret" => ::std::option::Option::Some(MessageType::MessageType_ThpQrCodeSecret), - "MessageType_ThpNfcTagHost" => ::std::option::Option::Some(MessageType::MessageType_ThpNfcTagHost), - "MessageType_ThpNfcTagTrezor" => ::std::option::Option::Some(MessageType::MessageType_ThpNfcTagTrezor), "MessageType_NostrGetPubkey" => ::std::option::Option::Some(MessageType::MessageType_NostrGetPubkey), "MessageType_NostrPubkey" => ::std::option::Option::Some(MessageType::MessageType_NostrPubkey), "MessageType_NostrSignEvent" => ::std::option::Option::Some(MessageType::MessageType_NostrSignEvent), @@ -1343,24 +1271,6 @@ impl ::protobuf::Enum for MessageType { MessageType::MessageType_SolanaAddress, MessageType::MessageType_SolanaSignTx, MessageType::MessageType_SolanaTxSignature, - MessageType::MessageType_ThpCreateNewSession, - MessageType::MessageType_ThpPairingRequest, - MessageType::MessageType_ThpPairingRequestApproved, - MessageType::MessageType_ThpSelectMethod, - MessageType::MessageType_ThpPairingPreparationsFinished, - MessageType::MessageType_ThpCredentialRequest, - MessageType::MessageType_ThpCredentialResponse, - MessageType::MessageType_ThpEndRequest, - MessageType::MessageType_ThpEndResponse, - MessageType::MessageType_ThpCodeEntryCommitment, - MessageType::MessageType_ThpCodeEntryChallenge, - MessageType::MessageType_ThpCodeEntryCpaceTrezor, - MessageType::MessageType_ThpCodeEntryCpaceHostTag, - MessageType::MessageType_ThpCodeEntrySecret, - MessageType::MessageType_ThpQrCodeTag, - MessageType::MessageType_ThpQrCodeSecret, - MessageType::MessageType_ThpNfcTagHost, - MessageType::MessageType_ThpNfcTagTrezor, MessageType::MessageType_NostrGetPubkey, MessageType::MessageType_NostrPubkey, MessageType::MessageType_NostrSignEvent, @@ -1618,32 +1528,14 @@ impl ::protobuf::EnumFull for MessageType { MessageType::MessageType_SolanaAddress => 235, MessageType::MessageType_SolanaSignTx => 236, MessageType::MessageType_SolanaTxSignature => 237, - MessageType::MessageType_ThpCreateNewSession => 238, - MessageType::MessageType_ThpPairingRequest => 239, - MessageType::MessageType_ThpPairingRequestApproved => 240, - MessageType::MessageType_ThpSelectMethod => 241, - MessageType::MessageType_ThpPairingPreparationsFinished => 242, - MessageType::MessageType_ThpCredentialRequest => 243, - MessageType::MessageType_ThpCredentialResponse => 244, - MessageType::MessageType_ThpEndRequest => 245, - MessageType::MessageType_ThpEndResponse => 246, - MessageType::MessageType_ThpCodeEntryCommitment => 247, - MessageType::MessageType_ThpCodeEntryChallenge => 248, - MessageType::MessageType_ThpCodeEntryCpaceTrezor => 249, - MessageType::MessageType_ThpCodeEntryCpaceHostTag => 250, - MessageType::MessageType_ThpCodeEntrySecret => 251, - MessageType::MessageType_ThpQrCodeTag => 252, - MessageType::MessageType_ThpQrCodeSecret => 253, - MessageType::MessageType_ThpNfcTagHost => 254, - MessageType::MessageType_ThpNfcTagTrezor => 255, - MessageType::MessageType_NostrGetPubkey => 256, - MessageType::MessageType_NostrPubkey => 257, - MessageType::MessageType_NostrSignEvent => 258, - MessageType::MessageType_NostrEventSignature => 259, - MessageType::MessageType_BenchmarkListNames => 260, - MessageType::MessageType_BenchmarkNames => 261, - MessageType::MessageType_BenchmarkRun => 262, - MessageType::MessageType_BenchmarkResult => 263, + MessageType::MessageType_NostrGetPubkey => 238, + MessageType::MessageType_NostrPubkey => 239, + MessageType::MessageType_NostrSignEvent => 240, + MessageType::MessageType_NostrEventSignature => 241, + MessageType::MessageType_BenchmarkListNames => 242, + MessageType::MessageType_BenchmarkNames => 243, + MessageType::MessageType_BenchmarkRun => 244, + MessageType::MessageType_BenchmarkResult => 245, }; Self::enum_descriptor().value_by_index(index) } @@ -1662,7 +1554,7 @@ impl MessageType { } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x0emessages.proto\x12\x12hw.trezor.messages\x1a\roptions.proto*\xfe[\ + \n\x0emessages.proto\x12\x12hw.trezor.messages\x1a\roptions.proto*\xcfU\ \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_S\ @@ -1934,40 +1826,19 @@ static file_descriptor_proto_data: &'static [u8] = b"\ ess\x10\x86\x07\x1a\x04\x90\xb5\x18\x01\x12$\n\x19MessageType_SolanaAddr\ ess\x10\x87\x07\x1a\x04\x98\xb5\x18\x01\x12#\n\x18MessageType_SolanaSign\ Tx\x10\x88\x07\x1a\x04\x90\xb5\x18\x01\x12(\n\x1dMessageType_SolanaTxSig\ - nature\x10\x89\x07\x1a\x04\x98\xb5\x18\x01\x12.\n\x1fMessageType_ThpCrea\ - teNewSession\x10\xe8\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12(\n\ - \x1dMessageType_ThpPairingRequest\x10\xee\x07\x1a\x04\x80\xa6\x1d\x01\ - \x120\n%MessageType_ThpPairingRequestApproved\x10\xef\x07\x1a\x04\x80\ - \xa6\x1d\x01\x12&\n\x1bMessageType_ThpSelectMethod\x10\xf0\x07\x1a\x04\ - \x80\xa6\x1d\x01\x125\n*MessageType_ThpPairingPreparationsFinished\x10\ - \xf1\x07\x1a\x04\x80\xa6\x1d\x01\x12+\n\x20MessageType_ThpCredentialRequ\ - est\x10\xf2\x07\x1a\x04\x80\xa6\x1d\x01\x12,\n!MessageType_ThpCredential\ - Response\x10\xf3\x07\x1a\x04\x80\xa6\x1d\x01\x12$\n\x19MessageType_ThpEn\ - dRequest\x10\xf4\x07\x1a\x04\x80\xa6\x1d\x01\x12%\n\x1aMessageType_ThpEn\ - dResponse\x10\xf5\x07\x1a\x04\x80\xa6\x1d\x01\x12-\n\"MessageType_ThpCod\ - eEntryCommitment\x10\xf8\x07\x1a\x04\x80\xa6\x1d\x01\x12,\n!MessageType_\ - ThpCodeEntryChallenge\x10\xf9\x07\x1a\x04\x80\xa6\x1d\x01\x12.\n#Message\ - Type_ThpCodeEntryCpaceTrezor\x10\xfa\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n$\ - MessageType_ThpCodeEntryCpaceHostTag\x10\xfb\x07\x1a\x04\x80\xa6\x1d\x01\ - \x12)\n\x1eMessageType_ThpCodeEntrySecret\x10\xfc\x07\x1a\x04\x80\xa6\ - \x1d\x01\x12#\n\x18MessageType_ThpQrCodeTag\x10\x80\x08\x1a\x04\x80\xa6\ - \x1d\x01\x12&\n\x1bMessageType_ThpQrCodeSecret\x10\x81\x08\x1a\x04\x80\ - \xa6\x1d\x01\x12$\n\x19MessageType_ThpNfcTagHost\x10\x88\x08\x1a\x04\x80\ - \xa6\x1d\x01\x12&\n\x1bMessageType_ThpNfcTagTrezor\x10\x89\x08\x1a\x04\ - \x80\xa6\x1d\x01\x12%\n\x1aMessageType_NostrGetPubkey\x10\xd1\x0f\x1a\ - \x04\x90\xb5\x18\x01\x12\"\n\x17MessageType_NostrPubkey\x10\xd2\x0f\x1a\ - \x04\x98\xb5\x18\x01\x12%\n\x1aMessageType_NostrSignEvent\x10\xd3\x0f\ - \x1a\x04\x90\xb5\x18\x01\x12*\n\x1fMessageType_NostrEventSignature\x10\ - \xd4\x0f\x1a\x04\x98\xb5\x18\x01\x12)\n\x1eMessageType_BenchmarkListName\ - s\x10\x8cG\x1a\x04\x80\xa6\x1d\x01\x12%\n\x1aMessageType_BenchmarkNames\ - \x10\x8dG\x1a\x04\x80\xa6\x1d\x01\x12#\n\x18MessageType_BenchmarkRun\x10\ - \x8eG\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bMessageType_BenchmarkResult\x10\ - \x8fG\x1a\x04\x80\xa6\x1d\x01\x1a\x04\xc8\xf3\x18\x01\"\x04\x08Z\x10\\\"\ - \x04\x08G\x10J\"\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\"\x06\x08\xbc\x05\x10\xc5\x05\"\x06\x08\xe9\x07\x10\xed\x07\"\ - \x06\x08\xf6\x07\x10\xf7\x07\"\x06\x08\xfd\x07\x10\xff\x07\"\x06\x08\x82\ - \x08\x10\x87\x08B8\n#com.satoshilabs.trezor.lib.protobufB\rTrezorMessage\ + nature\x10\x89\x07\x1a\x04\x98\xb5\x18\x01\x12%\n\x1aMessageType_NostrGe\ + tPubkey\x10\xd1\x0f\x1a\x04\x90\xb5\x18\x01\x12\"\n\x17MessageType_Nostr\ + Pubkey\x10\xd2\x0f\x1a\x04\x98\xb5\x18\x01\x12%\n\x1aMessageType_NostrSi\ + gnEvent\x10\xd3\x0f\x1a\x04\x90\xb5\x18\x01\x12*\n\x1fMessageType_NostrE\ + ventSignature\x10\xd4\x0f\x1a\x04\x98\xb5\x18\x01\x12)\n\x1eMessageType_\ + BenchmarkListNames\x10\x8cG\x1a\x04\x80\xa6\x1d\x01\x12%\n\x1aMessageTyp\ + e_BenchmarkNames\x10\x8dG\x1a\x04\x80\xa6\x1d\x01\x12#\n\x18MessageType_\ + BenchmarkRun\x10\x8eG\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bMessageType_Benc\ + hmarkResult\x10\x8fG\x1a\x04\x80\xa6\x1d\x01\x1a\x04\xc8\xf3\x18\x01\"\ + \x04\x08Z\x10\\\"\x04\x08G\x10J\"\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\"\x06\x08\xbc\x05\x10\xc5\x05\"\x06\x08\xe8\ + \x07\x10\xcb\x08B8\n#com.satoshilabs.trezor.lib.protobufB\rTrezorMessage\ \x80\xa6\x1d\x01\ "; diff --git a/rust/trezor-client/src/protos/generated/messages_thp.rs b/rust/trezor-client/src/protos/generated/messages_thp.rs index 049be4a3dc..aa9ead2e6f 100644 --- a/rust/trezor-client/src/protos/generated/messages_thp.rs +++ b/rust/trezor-client/src/protos/generated/messages_thp.rs @@ -3977,6 +3977,168 @@ impl ::protobuf::reflect::ProtobufValue for ThpAuthenticatedCredentialData { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } +#[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)] +// @@protoc_insertion_point(enum:hw.trezor.messages.thp.ThpMessageType) +pub enum ThpMessageType { + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCreateNewSession) + ThpMessageType_ThpCreateNewSession = 1000, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequest) + ThpMessageType_ThpPairingRequest = 1006, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestApproved) + ThpMessageType_ThpPairingRequestApproved = 1007, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpSelectMethod) + ThpMessageType_ThpSelectMethod = 1008, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingPreparationsFinished) + ThpMessageType_ThpPairingPreparationsFinished = 1009, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCredentialRequest) + ThpMessageType_ThpCredentialRequest = 1010, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCredentialResponse) + ThpMessageType_ThpCredentialResponse = 1011, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpEndRequest) + ThpMessageType_ThpEndRequest = 1012, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpEndResponse) + ThpMessageType_ThpEndResponse = 1013, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCodeEntryCommitment) + ThpMessageType_ThpCodeEntryCommitment = 1016, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCodeEntryChallenge) + ThpMessageType_ThpCodeEntryChallenge = 1017, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCodeEntryCpaceTrezor) + ThpMessageType_ThpCodeEntryCpaceTrezor = 1018, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCodeEntryCpaceHostTag) + ThpMessageType_ThpCodeEntryCpaceHostTag = 1019, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpCodeEntrySecret) + ThpMessageType_ThpCodeEntrySecret = 1020, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpQrCodeTag) + ThpMessageType_ThpQrCodeTag = 1024, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpQrCodeSecret) + ThpMessageType_ThpQrCodeSecret = 1025, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpNfcTagHost) + ThpMessageType_ThpNfcTagHost = 1032, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpNfcTagTrezor) + ThpMessageType_ThpNfcTagTrezor = 1033, +} + +impl ::protobuf::Enum for ThpMessageType { + const NAME: &'static str = "ThpMessageType"; + + fn value(&self) -> i32 { + *self as i32 + } + + fn from_i32(value: i32) -> ::std::option::Option { + match value { + 1000 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession), + 1006 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), + 1007 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved), + 1008 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), + 1009 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished), + 1010 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest), + 1011 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialResponse), + 1012 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpEndRequest), + 1013 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpEndResponse), + 1016 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryCommitment), + 1017 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryChallenge), + 1018 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor), + 1019 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag), + 1020 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntrySecret), + 1024 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpQrCodeTag), + 1025 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpQrCodeSecret), + 1032 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpNfcTagHost), + 1033 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpNfcTagTrezor), + _ => ::std::option::Option::None + } + } + + fn from_str(str: &str) -> ::std::option::Option { + match str { + "ThpMessageType_ThpCreateNewSession" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession), + "ThpMessageType_ThpPairingRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), + "ThpMessageType_ThpPairingRequestApproved" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved), + "ThpMessageType_ThpSelectMethod" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), + "ThpMessageType_ThpPairingPreparationsFinished" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished), + "ThpMessageType_ThpCredentialRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest), + "ThpMessageType_ThpCredentialResponse" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialResponse), + "ThpMessageType_ThpEndRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpEndRequest), + "ThpMessageType_ThpEndResponse" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpEndResponse), + "ThpMessageType_ThpCodeEntryCommitment" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryCommitment), + "ThpMessageType_ThpCodeEntryChallenge" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryChallenge), + "ThpMessageType_ThpCodeEntryCpaceTrezor" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor), + "ThpMessageType_ThpCodeEntryCpaceHostTag" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag), + "ThpMessageType_ThpCodeEntrySecret" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCodeEntrySecret), + "ThpMessageType_ThpQrCodeTag" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpQrCodeTag), + "ThpMessageType_ThpQrCodeSecret" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpQrCodeSecret), + "ThpMessageType_ThpNfcTagHost" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpNfcTagHost), + "ThpMessageType_ThpNfcTagTrezor" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpNfcTagTrezor), + _ => ::std::option::Option::None + } + } + + const VALUES: &'static [ThpMessageType] = &[ + ThpMessageType::ThpMessageType_ThpCreateNewSession, + ThpMessageType::ThpMessageType_ThpPairingRequest, + ThpMessageType::ThpMessageType_ThpPairingRequestApproved, + ThpMessageType::ThpMessageType_ThpSelectMethod, + ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished, + ThpMessageType::ThpMessageType_ThpCredentialRequest, + ThpMessageType::ThpMessageType_ThpCredentialResponse, + ThpMessageType::ThpMessageType_ThpEndRequest, + ThpMessageType::ThpMessageType_ThpEndResponse, + ThpMessageType::ThpMessageType_ThpCodeEntryCommitment, + ThpMessageType::ThpMessageType_ThpCodeEntryChallenge, + ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor, + ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag, + ThpMessageType::ThpMessageType_ThpCodeEntrySecret, + ThpMessageType::ThpMessageType_ThpQrCodeTag, + ThpMessageType::ThpMessageType_ThpQrCodeSecret, + ThpMessageType::ThpMessageType_ThpNfcTagHost, + ThpMessageType::ThpMessageType_ThpNfcTagTrezor, + ]; +} + +impl ::protobuf::EnumFull for ThpMessageType { + 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("ThpMessageType").unwrap()).clone() + } + + fn descriptor(&self) -> ::protobuf::reflect::EnumValueDescriptor { + let index = match self { + ThpMessageType::ThpMessageType_ThpCreateNewSession => 0, + ThpMessageType::ThpMessageType_ThpPairingRequest => 1, + ThpMessageType::ThpMessageType_ThpPairingRequestApproved => 2, + ThpMessageType::ThpMessageType_ThpSelectMethod => 3, + ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 4, + ThpMessageType::ThpMessageType_ThpCredentialRequest => 5, + ThpMessageType::ThpMessageType_ThpCredentialResponse => 6, + ThpMessageType::ThpMessageType_ThpEndRequest => 7, + ThpMessageType::ThpMessageType_ThpEndResponse => 8, + ThpMessageType::ThpMessageType_ThpCodeEntryCommitment => 9, + ThpMessageType::ThpMessageType_ThpCodeEntryChallenge => 10, + ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor => 11, + ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag => 12, + ThpMessageType::ThpMessageType_ThpCodeEntrySecret => 13, + ThpMessageType::ThpMessageType_ThpQrCodeTag => 14, + ThpMessageType::ThpMessageType_ThpQrCodeSecret => 15, + ThpMessageType::ThpMessageType_ThpNfcTagHost => 16, + ThpMessageType::ThpMessageType_ThpNfcTagTrezor => 17, + }; + Self::enum_descriptor().value_by_index(index) + } +} + +// Note, `Default` is implemented although default value is not 0 +impl ::std::default::Default for ThpMessageType { + fn default() -> Self { + ThpMessageType::ThpMessageType_ThpCreateNewSession + } +} + +impl ThpMessageType { + fn generated_enum_descriptor_data() -> ::protobuf::reflect::GeneratedEnumDescriptorData { + ::protobuf::reflect::GeneratedEnumDescriptorData::new::("ThpMessageType") + } +} + #[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)] // @@protoc_insertion_point(enum:hw.trezor.messages.thp.ThpPairingMethod) pub enum ThpPairingMethod { @@ -4064,43 +4226,75 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x02(\rR\x14protocolVersionMinor\x12Q\n\x0fpairing_methods\x18\x05\x20\ \x03(\x0e2(.hw.trezor.messages.thp.ThpPairingMethodR\x0epairingMethods\"\ _\n%ThpHandshakeCompletionReqNoisePayload\x126\n\x17host_pairing_credent\ - ial\x18\x01\x20\x01(\x0cR\x15hostPairingCredential\"\x80\x01\n\x13ThpCre\ + ial\x18\x01\x20\x01(\x0cR\x15hostPairingCredential\"\x94\x01\n\x13ThpCre\ ateNewSession\x12\x1e\n\npassphrase\x18\x01\x20\x01(\tR\npassphrase\x12\ \x1b\n\ton_device\x18\x02\x20\x01(\x08R\x08onDevice\x12,\n\x0ederive_car\ - dano\x18\x03\x20\x01(\x08:\x05falseR\rderiveCardano\"0\n\x11ThpPairingRe\ - quest\x12\x1b\n\thost_name\x18\x01\x20\x01(\tR\x08hostName\"\x1b\n\x19Th\ - pPairingRequestApproved\"s\n\x0fThpSelectMethod\x12`\n\x17selected_pairi\ - ng_method\x18\x01\x20\x02(\x0e2(.hw.trezor.messages.thp.ThpPairingMethod\ - R\x15selectedPairingMethod\"\x20\n\x1eThpPairingPreparationsFinished\"8\ - \n\x16ThpCodeEntryCommitment\x12\x1e\n\ncommitment\x18\x01\x20\x02(\x0cR\ - \ncommitment\"5\n\x15ThpCodeEntryChallenge\x12\x1c\n\tchallenge\x18\x01\ - \x20\x02(\x0cR\tchallenge\"P\n\x17ThpCodeEntryCpaceTrezor\x125\n\x17cpac\ - e_trezor_public_key\x18\x01\x20\x02(\x0cR\x14cpaceTrezorPublicKey\"_\n\ - \x18ThpCodeEntryCpaceHostTag\x121\n\x15cpace_host_public_key\x18\x01\x20\ - \x02(\x0cR\x12cpaceHostPublicKey\x12\x10\n\x03tag\x18\x02\x20\x02(\x0cR\ - \x03tag\",\n\x12ThpCodeEntrySecret\x12\x16\n\x06secret\x18\x01\x20\x02(\ - \x0cR\x06secret\"\x20\n\x0cThpQrCodeTag\x12\x10\n\x03tag\x18\x01\x20\x02\ - (\x0cR\x03tag\")\n\x0fThpQrCodeSecret\x12\x16\n\x06secret\x18\x01\x20\ - \x02(\x0cR\x06secret\"!\n\rThpNfcTagHost\x12\x10\n\x03tag\x18\x01\x20\ - \x02(\x0cR\x03tag\"#\n\x0fThpNfcTagTrezor\x12\x10\n\x03tag\x18\x01\x20\ - \x02(\x0cR\x03tag\"\x8d\x01\n\x14ThpCredentialRequest\x12,\n\x12host_sta\ - tic_pubkey\x18\x01\x20\x02(\x0cR\x10hostStaticPubkey\x12'\n\x0bautoconne\ - ct\x18\x02\x20\x01(\x08:\x05falseR\x0bautoconnect\x12\x1e\n\ncredential\ - \x18\x03\x20\x01(\x0cR\ncredential\"i\n\x15ThpCredentialResponse\x120\n\ - \x14trezor_static_pubkey\x18\x01\x20\x02(\x0cR\x12trezorStaticPubkey\x12\ - \x1e\n\ncredential\x18\x02\x20\x02(\x0cR\ncredential\"\x0f\n\rThpEndRequ\ - est\"\x10\n\x0eThpEndResponse\"\\\n\x15ThpCredentialMetadata\x12\x1b\n\t\ - host_name\x18\x01\x20\x01(\tR\x08hostName\x12\x20\n\x0bautoconnect\x18\ - \x02\x20\x01(\x08R\x0bautoconnect:\x04\x98\xb2\x19\x01\"\x82\x01\n\x14Th\ - pPairingCredential\x12R\n\rcred_metadata\x18\x01\x20\x02(\x0b2-.hw.trezo\ - r.messages.thp.ThpCredentialMetadataR\x0ccredMetadata\x12\x10\n\x03mac\ - \x18\x02\x20\x02(\x0cR\x03mac:\x04\x98\xb2\x19\x01\"\xa8\x01\n\x1eThpAut\ - henticatedCredentialData\x12,\n\x12host_static_pubkey\x18\x01\x20\x02(\ - \x0cR\x10hostStaticPubkey\x12R\n\rcred_metadata\x18\x02\x20\x02(\x0b2-.h\ - w.trezor.messages.thp.ThpCredentialMetadataR\x0ccredMetadata:\x04\x98\ - \xb2\x19\x01*G\n\x10ThpPairingMethod\x12\x0f\n\x0bSkipPairing\x10\x01\ - \x12\r\n\tCodeEntry\x10\x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03NFC\ - \x10\x04B;\n#com.satoshilabs.trezor.lib.protobufB\x10TrezorMessageThp\ + dano\x18\x03\x20\x01(\x08:\x05falseR\rderiveCardano:\x12\xa2\xb2\x19\x0e\ + ThpMessageType\"D\n\x11ThpPairingRequest\x12\x1b\n\thost_name\x18\x01\ + \x20\x01(\tR\x08hostName:\x12\xa2\xb2\x19\x0eThpMessageType\"/\n\x19ThpP\ + airingRequestApproved:\x12\xa2\xb2\x19\x0eThpMessageType\"\x87\x01\n\x0f\ + ThpSelectMethod\x12`\n\x17selected_pairing_method\x18\x01\x20\x02(\x0e2(\ + .hw.trezor.messages.thp.ThpPairingMethodR\x15selectedPairingMethod:\x12\ + \xa2\xb2\x19\x0eThpMessageType\"4\n\x1eThpPairingPreparationsFinished:\ + \x12\xa2\xb2\x19\x0eThpMessageType\"L\n\x16ThpCodeEntryCommitment\x12\ + \x1e\n\ncommitment\x18\x01\x20\x02(\x0cR\ncommitment:\x12\xa2\xb2\x19\ + \x0eThpMessageType\"I\n\x15ThpCodeEntryChallenge\x12\x1c\n\tchallenge\ + \x18\x01\x20\x02(\x0cR\tchallenge:\x12\xa2\xb2\x19\x0eThpMessageType\"d\ + \n\x17ThpCodeEntryCpaceTrezor\x125\n\x17cpace_trezor_public_key\x18\x01\ + \x20\x02(\x0cR\x14cpaceTrezorPublicKey:\x12\xa2\xb2\x19\x0eThpMessageTyp\ + e\"s\n\x18ThpCodeEntryCpaceHostTag\x121\n\x15cpace_host_public_key\x18\ + \x01\x20\x02(\x0cR\x12cpaceHostPublicKey\x12\x10\n\x03tag\x18\x02\x20\ + \x02(\x0cR\x03tag:\x12\xa2\xb2\x19\x0eThpMessageType\"@\n\x12ThpCodeEntr\ + ySecret\x12\x16\n\x06secret\x18\x01\x20\x02(\x0cR\x06secret:\x12\xa2\xb2\ + \x19\x0eThpMessageType\"4\n\x0cThpQrCodeTag\x12\x10\n\x03tag\x18\x01\x20\ + \x02(\x0cR\x03tag:\x12\xa2\xb2\x19\x0eThpMessageType\"=\n\x0fThpQrCodeSe\ + cret\x12\x16\n\x06secret\x18\x01\x20\x02(\x0cR\x06secret:\x12\xa2\xb2\ + \x19\x0eThpMessageType\"5\n\rThpNfcTagHost\x12\x10\n\x03tag\x18\x01\x20\ + \x02(\x0cR\x03tag:\x12\xa2\xb2\x19\x0eThpMessageType\"7\n\x0fThpNfcTagTr\ + ezor\x12\x10\n\x03tag\x18\x01\x20\x02(\x0cR\x03tag:\x12\xa2\xb2\x19\x0eT\ + hpMessageType\"\xa1\x01\n\x14ThpCredentialRequest\x12,\n\x12host_static_\ + pubkey\x18\x01\x20\x02(\x0cR\x10hostStaticPubkey\x12'\n\x0bautoconnect\ + \x18\x02\x20\x01(\x08:\x05falseR\x0bautoconnect\x12\x1e\n\ncredential\ + \x18\x03\x20\x01(\x0cR\ncredential:\x12\xa2\xb2\x19\x0eThpMessageType\"}\ + \n\x15ThpCredentialResponse\x120\n\x14trezor_static_pubkey\x18\x01\x20\ + \x02(\x0cR\x12trezorStaticPubkey\x12\x1e\n\ncredential\x18\x02\x20\x02(\ + \x0cR\ncredential:\x12\xa2\xb2\x19\x0eThpMessageType\"#\n\rThpEndRequest\ + :\x12\xa2\xb2\x19\x0eThpMessageType\"$\n\x0eThpEndResponse:\x12\xa2\xb2\ + \x19\x0eThpMessageType\"\\\n\x15ThpCredentialMetadata\x12\x1b\n\thost_na\ + me\x18\x01\x20\x01(\tR\x08hostName\x12\x20\n\x0bautoconnect\x18\x02\x20\ + \x01(\x08R\x0bautoconnect:\x04\x98\xb2\x19\x01\"\x82\x01\n\x14ThpPairing\ + Credential\x12R\n\rcred_metadata\x18\x01\x20\x02(\x0b2-.hw.trezor.messag\ + es.thp.ThpCredentialMetadataR\x0ccredMetadata\x12\x10\n\x03mac\x18\x02\ + \x20\x02(\x0cR\x03mac:\x04\x98\xb2\x19\x01\"\xa8\x01\n\x1eThpAuthenticat\ + edCredentialData\x12,\n\x12host_static_pubkey\x18\x01\x20\x02(\x0cR\x10h\ + ostStaticPubkey\x12R\n\rcred_metadata\x18\x02\x20\x02(\x0b2-.hw.trezor.m\ + essages.thp.ThpCredentialMetadataR\x0ccredMetadata:\x04\x98\xb2\x19\x01*\ + \x8f\x07\n\x0eThpMessageType\x121\n\"ThpMessageType_ThpCreateNewSession\ + \x10\xe8\x07\x1a\x08\x80\xa6\x1d\x01\x90\xb5\x18\x01\x12+\n\x20ThpMessag\ + eType_ThpPairingRequest\x10\xee\x07\x1a\x04\x80\xa6\x1d\x01\x123\n(ThpMe\ + ssageType_ThpPairingRequestApproved\x10\xef\x07\x1a\x04\x80\xa6\x1d\x01\ + \x12)\n\x1eThpMessageType_ThpSelectMethod\x10\xf0\x07\x1a\x04\x80\xa6\ + \x1d\x01\x128\n-ThpMessageType_ThpPairingPreparationsFinished\x10\xf1\ + \x07\x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMessageType_ThpCredentialRequest\ + \x10\xf2\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n$ThpMessageType_ThpCredential\ + Response\x10\xf3\x07\x1a\x04\x80\xa6\x1d\x01\x12'\n\x1cThpMessageType_Th\ + pEndRequest\x10\xf4\x07\x1a\x04\x80\xa6\x1d\x01\x12(\n\x1dThpMessageType\ + _ThpEndResponse\x10\xf5\x07\x1a\x04\x80\xa6\x1d\x01\x120\n%ThpMessageTyp\ + e_ThpCodeEntryCommitment\x10\xf8\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n$ThpM\ + essageType_ThpCodeEntryChallenge\x10\xf9\x07\x1a\x04\x80\xa6\x1d\x01\x12\ + 1\n&ThpMessageType_ThpCodeEntryCpaceTrezor\x10\xfa\x07\x1a\x04\x80\xa6\ + \x1d\x01\x122\n'ThpMessageType_ThpCodeEntryCpaceHostTag\x10\xfb\x07\x1a\ + \x04\x80\xa6\x1d\x01\x12,\n!ThpMessageType_ThpCodeEntrySecret\x10\xfc\ + \x07\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bThpMessageType_ThpQrCodeTag\x10\ + \x80\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMessageType_ThpQrCodeSecre\ + t\x10\x81\x08\x1a\x04\x80\xa6\x1d\x01\x12'\n\x1cThpMessageType_ThpNfcTag\ + Host\x10\x88\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMessageType_ThpNfc\ + TagTrezor\x10\x89\x08\x1a\x04\x80\xa6\x1d\x01\"\x05\x08\0\x10\xe7\x07\"\ + \x06\x08\xe9\x07\x10\xed\x07\"\x06\x08\xf6\x07\x10\xf7\x07\"\x06\x08\xfd\ + \x07\x10\xff\x07\"\x06\x08\x82\x08\x10\x87\x08\"\t\x08\xcc\x08\x10\xff\ + \xff\xff\xff\x07*G\n\x10ThpPairingMethod\x12\x0f\n\x0bSkipPairing\x10\ + \x01\x12\r\n\tCodeEntry\x10\x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03N\ + FC\x10\x04B;\n#com.satoshilabs.trezor.lib.protobufB\x10TrezorMessageThp\ \x80\xa6\x1d\x01\ "; @@ -4144,7 +4338,8 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { messages.push(ThpCredentialMetadata::generated_message_descriptor_data()); messages.push(ThpPairingCredential::generated_message_descriptor_data()); messages.push(ThpAuthenticatedCredentialData::generated_message_descriptor_data()); - let mut enums = ::std::vec::Vec::with_capacity(1); + let mut enums = ::std::vec::Vec::with_capacity(2); + enums.push(ThpMessageType::generated_enum_descriptor_data()); enums.push(ThpPairingMethod::generated_enum_descriptor_data()); ::protobuf::reflect::GeneratedFileDescriptor::new_generated( file_descriptor_proto(),