diff --git a/common/protob/messages-thp.proto b/common/protob/messages-thp.proto index f9cc2d4a91..dcf817ae15 100644 --- a/common/protob/messages-thp.proto +++ b/common/protob/messages-thp.proto @@ -10,6 +10,42 @@ import "options.proto"; option (include_in_bitcoin_only) = true; +/** + * Mapping between Trezor wire identifier (uint) and a Thp protobuf message + */ +enum ThpMessageType { + reserved 0 to 19; // Values reserved by other messages, see messages.proto + ThpMessageType_Cancel = 20; + reserved 21 to 25; + ThpMessageType_ButtonRequest = 26; + reserved 27 to 999; + + reserved 1000; // MessageType_ThpCreateNewSession + reserved 1001 to 1005; // never appeared in a release, reserved for future use + ThpMessageType_ThpPairingRequest = 1006; + ThpMessageType_ThpPairingRequestApproved = 1007; + ThpMessageType_ThpSelectMethod = 1008; + ThpMessageType_ThpPairingPreparationsFinished = 1009; + ThpMessageType_ThpCredentialRequest = 1010; + ThpMessageType_ThpCredentialResponse = 1011; + ThpMessageType_ThpEndRequest = 1012; + ThpMessageType_ThpEndResponse = 1013; + reserved 1014 to 1015; // reserved for future use + ThpMessageType_ThpCodeEntryCommitment = 1016; + ThpMessageType_ThpCodeEntryChallenge = 1017; + ThpMessageType_ThpCodeEntryCpaceTrezor = 1018; + ThpMessageType_ThpCodeEntryCpaceHostTag = 1019; + ThpMessageType_ThpCodeEntrySecret = 1020; + reserved 1021 to 1023; // reserved for future use + ThpMessageType_ThpQrCodeTag = 1024; + ThpMessageType_ThpQrCodeSecret = 1025; + reserved 1026 to 1031; // reserved for future use + ThpMessageType_ThpNfcTagHost = 1032; + ThpMessageType_ThpNfcTagTrezor = 1033; + + reserved 1100 to 2147483647; // Values reserved by other messages, see messages.proto +} + /** * Numeric identifiers of pairing methods. * @embed @@ -44,7 +80,7 @@ message ThpHandshakeCompletionReqNoisePayload { * @start * @next Success */ -message ThpCreateNewSession{ +message ThpCreateNewSession { optional string passphrase = 1; optional bool on_device = 2 [default=false]; // User wants to enter passphrase on the device optional bool derive_cardano = 3 [default=false]; // If True, Cardano keys will be derived. Ignored with BTC-only @@ -56,7 +92,7 @@ message ThpCreateNewSession{ * @start * @next ThpPairingRequestApproved */ -message ThpPairingRequest{ +message ThpPairingRequest { optional string host_name = 1; // Human-readable host name } @@ -65,7 +101,7 @@ message ThpPairingRequest{ * @start * @next ThpSelectMethod */ -message ThpPairingRequestApproved{ +message ThpPairingRequestApproved { } /** @@ -84,7 +120,7 @@ message ThpSelectMethod { * @next ThpQrCodeTag * @next ThpNfcTagHost */ -message ThpPairingPreparationsFinished{ +message ThpPairingPreparationsFinished { } /** diff --git a/common/protob/messages.proto b/common/protob/messages.proto index 9c12e485c6..4626d8fb1e 100644 --- a/common/protob/messages.proto +++ b/common/protob/messages.proto @@ -319,28 +319,11 @@ enum MessageType { MessageType_SolanaTxSignature = 905 [(wire_out) = true]; // THP - MessageType_ThpCreateNewSession = 1000 [(bitcoin_only) = true, (wire_in) = true]; - reserved 1001 to 1005; // never appeared in a release, reserved for future use - MessageType_ThpPairingRequest = 1006 [(bitcoin_only) = true]; - MessageType_ThpPairingRequestApproved = 1007 [(bitcoin_only) = true]; - MessageType_ThpSelectMethod = 1008 [(bitcoin_only) = true]; - MessageType_ThpPairingPreparationsFinished = 1009 [(bitcoin_only) = true]; - MessageType_ThpCredentialRequest = 1010 [(bitcoin_only) = true]; - MessageType_ThpCredentialResponse = 1011 [(bitcoin_only) = true]; - MessageType_ThpEndRequest = 1012 [(bitcoin_only) = true]; - MessageType_ThpEndResponse = 1013 [(bitcoin_only) = true]; - reserved 1014 to 1015; - MessageType_ThpCodeEntryCommitment = 1016 [(bitcoin_only) = true]; - MessageType_ThpCodeEntryChallenge = 1017 [(bitcoin_only) = true]; - MessageType_ThpCodeEntryCpaceTrezor = 1018 [(bitcoin_only) = true]; - MessageType_ThpCodeEntryCpaceHostTag = 1019 [(bitcoin_only) = true]; - MessageType_ThpCodeEntrySecret = 1020 [(bitcoin_only) = true]; - reserved 1021 to 1023; - MessageType_ThpQrCodeTag = 1024 [(bitcoin_only) = true]; - MessageType_ThpQrCodeSecret = 1025 [(bitcoin_only) = true]; - reserved 1026 to 1031; - MessageType_ThpNfcTagHost = 1032 [(bitcoin_only) = true]; - MessageType_ThpNfcTagTrezor = 1033 [(bitcoin_only) = true]; + MessageType_ThpCreateNewSession = 1000; + reserved 1001 to 1009; // see ThpMessageType in messages-thp.proto + MessageType_ThpCredentialRequest = 1010; + MessageType_ThpCredentialResponse = 1011; + reserved 1012 to 1099; // see ThpMessageType in messages-thp.proto // Nostr MessageType_NostrGetPubkey = 2001 [(wire_in) = true]; diff --git a/core/embed/upymod/qstrdefsport.h b/core/embed/upymod/qstrdefsport.h index 0594b7f09a..760201b9d8 100644 --- a/core/embed/upymod/qstrdefsport.h +++ b/core/embed/upymod/qstrdefsport.h @@ -388,11 +388,13 @@ Q(workflow_handlers) Q(writers) #if USE_THP +Q(ThpMessageType) Q(ThpPairingMethod) Q(apps.thp) Q(apps.thp.credential_manager) Q(credential_manager) Q(thp) +Q(trezor.enums.ThpMessageType) Q(trezor.enums.ThpPairingMethod) #endif diff --git a/core/src/trezor/enums/MessageType.py b/core/src/trezor/enums/MessageType.py index 6b88a362c3..cc5357aa3b 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 @@ -265,6 +246,9 @@ if not utils.BITCOIN_ONLY: SolanaAddress = 903 SolanaSignTx = 904 SolanaTxSignature = 905 + ThpCreateNewSession = 1000 + ThpCredentialRequest = 1010 + ThpCredentialResponse = 1011 NostrGetPubkey = 2001 NostrPubkey = 2002 NostrSignEvent = 2003 diff --git a/core/src/trezor/enums/ThpMessageType.py b/core/src/trezor/enums/ThpMessageType.py new file mode 100644 index 0000000000..f40061b556 --- /dev/null +++ b/core/src/trezor/enums/ThpMessageType.py @@ -0,0 +1,26 @@ +# Automatically generated by pb2py +# fmt: off +# isort:skip_file + +from trezor import utils + +Cancel = 20 +ButtonRequest = 26 +if utils.USE_THP: + 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 diff --git a/core/src/trezor/enums/__init__.py b/core/src/trezor/enums/__init__.py index 51a73c5c99..fb9989df24 100644 --- a/core/src/trezor/enums/__init__.py +++ b/core/src/trezor/enums/__init__.py @@ -337,6 +337,27 @@ if TYPE_CHECKING: Nay = 1 Pass = 2 + class ThpMessageType(IntEnum): + Cancel = 20 + ButtonRequest = 26 + 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 @@ -583,23 +604,8 @@ if TYPE_CHECKING: 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 c2fcb20c0d..93eb07bb14 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 416eb1136f..e4aa13ce26 100644 --- a/python/src/trezorlib/messages.py +++ b/python/src/trezorlib/messages.py @@ -387,6 +387,28 @@ class TezosBallotType(IntEnum): Pass = 2 +class ThpMessageType(IntEnum): + Cancel = 20 + ButtonRequest = 26 + 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 @@ -634,23 +656,8 @@ class MessageType(IntEnum): 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 @@ -7920,7 +7927,7 @@ class ThpCreateNewSession(protobuf.MessageType): class ThpPairingRequest(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1006 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("host_name", "string", repeated=False, required=False, default=None), } @@ -7934,11 +7941,11 @@ class ThpPairingRequest(protobuf.MessageType): class ThpPairingRequestApproved(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1007 + MESSAGE_WIRE_TYPE = None class ThpSelectMethod(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1008 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("selected_pairing_method", "ThpPairingMethod", repeated=False, required=True), } @@ -7952,11 +7959,11 @@ class ThpSelectMethod(protobuf.MessageType): class ThpPairingPreparationsFinished(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1009 + MESSAGE_WIRE_TYPE = None class ThpCodeEntryCommitment(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1016 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("commitment", "bytes", repeated=False, required=True), } @@ -7970,7 +7977,7 @@ class ThpCodeEntryCommitment(protobuf.MessageType): class ThpCodeEntryChallenge(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1017 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("challenge", "bytes", repeated=False, required=True), } @@ -7984,7 +7991,7 @@ class ThpCodeEntryChallenge(protobuf.MessageType): class ThpCodeEntryCpaceTrezor(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1018 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("cpace_trezor_public_key", "bytes", repeated=False, required=True), } @@ -7998,7 +8005,7 @@ class ThpCodeEntryCpaceTrezor(protobuf.MessageType): class ThpCodeEntryCpaceHostTag(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1019 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("cpace_host_public_key", "bytes", repeated=False, required=True), 2: protobuf.Field("tag", "bytes", repeated=False, required=True), @@ -8015,7 +8022,7 @@ class ThpCodeEntryCpaceHostTag(protobuf.MessageType): class ThpCodeEntrySecret(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1020 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("secret", "bytes", repeated=False, required=True), } @@ -8029,7 +8036,7 @@ class ThpCodeEntrySecret(protobuf.MessageType): class ThpQrCodeTag(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1024 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("tag", "bytes", repeated=False, required=True), } @@ -8043,7 +8050,7 @@ class ThpQrCodeTag(protobuf.MessageType): class ThpQrCodeSecret(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1025 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("secret", "bytes", repeated=False, required=True), } @@ -8057,7 +8064,7 @@ class ThpQrCodeSecret(protobuf.MessageType): class ThpNfcTagHost(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1032 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("tag", "bytes", repeated=False, required=True), } @@ -8071,7 +8078,7 @@ class ThpNfcTagHost(protobuf.MessageType): class ThpNfcTagTrezor(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1033 + MESSAGE_WIRE_TYPE = None FIELDS = { 1: protobuf.Field("tag", "bytes", repeated=False, required=True), } @@ -8122,11 +8129,11 @@ class ThpCredentialResponse(protobuf.MessageType): class ThpEndRequest(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1012 + MESSAGE_WIRE_TYPE = None class ThpEndResponse(protobuf.MessageType): - MESSAGE_WIRE_TYPE = 1013 + MESSAGE_WIRE_TYPE = None class ThpCredentialMetadata(protobuf.MessageType): diff --git a/rust/trezor-client/src/messages/generated.rs b/rust/trezor-client/src/messages/generated.rs index 24e4b08553..81f69ee0ba 100644 --- a/rust/trezor-client/src/messages/generated.rs +++ b/rust/trezor-client/src/messages/generated.rs @@ -88,23 +88,8 @@ trezor_message_impl! { 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..489bfcd2ae 100644 --- a/rust/trezor-client/src/protos/generated/messages.rs +++ b/rust/trezor-client/src/protos/generated/messages.rs @@ -505,40 +505,10 @@ pub enum MessageType { 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) @@ -805,23 +775,8 @@ impl ::protobuf::Enum for MessageType { 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), @@ -1075,23 +1030,8 @@ impl ::protobuf::Enum for MessageType { "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), @@ -1344,23 +1284,8 @@ impl ::protobuf::Enum for MessageType { 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, @@ -1619,31 +1544,16 @@ impl ::protobuf::EnumFull for MessageType { 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_ThpCredentialRequest => 239, + MessageType::MessageType_ThpCredentialResponse => 240, + MessageType::MessageType_NostrGetPubkey => 241, + MessageType::MessageType_NostrPubkey => 242, + MessageType::MessageType_NostrSignEvent => 243, + MessageType::MessageType_NostrEventSignature => 244, + MessageType::MessageType_BenchmarkListNames => 245, + MessageType::MessageType_BenchmarkNames => 246, + MessageType::MessageType_BenchmarkRun => 247, + MessageType::MessageType_BenchmarkResult => 248, }; Self::enum_descriptor().value_by_index(index) } @@ -1662,7 +1572,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*\xccV\ \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,41 +1844,22 @@ 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\ - \x80\xa6\x1d\x01\ + nature\x10\x89\x07\x1a\x04\x98\xb5\x18\x01\x12$\n\x1fMessageType_ThpCrea\ + teNewSession\x10\xe8\x07\x12%\n\x20MessageType_ThpCredentialRequest\x10\ + \xf2\x07\x12&\n!MessageType_ThpCredentialResponse\x10\xf3\x07\x12%\n\x1a\ + MessageType_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_BenchmarkListNames\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\xf1\x07\"\x06\x08\xf4\x07\x10\xcb\x08\ + B8\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 aded1f635f..b3be84a8fc 100644 --- a/rust/trezor-client/src/protos/generated/messages_thp.rs +++ b/rust/trezor-client/src/protos/generated/messages_thp.rs @@ -3977,6 +3977,174 @@ 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_Cancel) + ThpMessageType_Cancel = 20, + // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ButtonRequest) + ThpMessageType_ButtonRequest = 26, + // @@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 { + 20 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_Cancel), + 26 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonRequest), + 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_Cancel" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_Cancel), + "ThpMessageType_ButtonRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonRequest), + "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_Cancel, + ThpMessageType::ThpMessageType_ButtonRequest, + 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_Cancel => 0, + ThpMessageType::ThpMessageType_ButtonRequest => 1, + ThpMessageType::ThpMessageType_ThpPairingRequest => 2, + ThpMessageType::ThpMessageType_ThpPairingRequestApproved => 3, + ThpMessageType::ThpMessageType_ThpSelectMethod => 4, + ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 5, + ThpMessageType::ThpMessageType_ThpCredentialRequest => 6, + ThpMessageType::ThpMessageType_ThpCredentialResponse => 7, + ThpMessageType::ThpMessageType_ThpEndRequest => 8, + ThpMessageType::ThpMessageType_ThpEndResponse => 9, + ThpMessageType::ThpMessageType_ThpCodeEntryCommitment => 10, + ThpMessageType::ThpMessageType_ThpCodeEntryChallenge => 11, + ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor => 12, + ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag => 13, + ThpMessageType::ThpMessageType_ThpCodeEntrySecret => 14, + ThpMessageType::ThpMessageType_ThpQrCodeTag => 15, + ThpMessageType::ThpMessageType_ThpQrCodeSecret => 16, + ThpMessageType::ThpMessageType_ThpNfcTagHost => 17, + ThpMessageType::ThpMessageType_ThpNfcTagTrezor => 18, + }; + 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_Cancel + } +} + +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 { @@ -4098,10 +4266,28 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x01\n\x1eThpAuthenticatedCredentialData\x12,\n\x12host_static_pubkey\ \x18\x01\x20\x02(\x0cR\x10hostStaticPubkey\x12R\n\rcred_metadata\x18\x02\ \x20\x02(\x0b2-.hw.trezor.messages.thp.ThpCredentialMetadataR\x0ccredMet\ - adata:\x04\x98\xb2\x19\x01*G\n\x10ThpPairingMethod\x12\x0f\n\x0bSkipPair\ - ing\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\x10TrezorMess\ - ageThp\x80\xa6\x1d\x01\ + adata:\x04\x98\xb2\x19\x01*\xc7\x06\n\x0eThpMessageType\x12\x19\n\x15Thp\ + MessageType_Cancel\x10\x14\x12\x20\n\x1cThpMessageType_ButtonRequest\x10\ + \x1a\x12%\n\x20ThpMessageType_ThpPairingRequest\x10\xee\x07\x12-\n(ThpMe\ + ssageType_ThpPairingRequestApproved\x10\xef\x07\x12#\n\x1eThpMessageType\ + _ThpSelectMethod\x10\xf0\x07\x122\n-ThpMessageType_ThpPairingPreparation\ + sFinished\x10\xf1\x07\x12(\n#ThpMessageType_ThpCredentialRequest\x10\xf2\ + \x07\x12)\n$ThpMessageType_ThpCredentialResponse\x10\xf3\x07\x12!\n\x1cT\ + hpMessageType_ThpEndRequest\x10\xf4\x07\x12\"\n\x1dThpMessageType_ThpEnd\ + Response\x10\xf5\x07\x12*\n%ThpMessageType_ThpCodeEntryCommitment\x10\ + \xf8\x07\x12)\n$ThpMessageType_ThpCodeEntryChallenge\x10\xf9\x07\x12+\n&\ + ThpMessageType_ThpCodeEntryCpaceTrezor\x10\xfa\x07\x12,\n'ThpMessageType\ + _ThpCodeEntryCpaceHostTag\x10\xfb\x07\x12&\n!ThpMessageType_ThpCodeEntry\ + Secret\x10\xfc\x07\x12\x20\n\x1bThpMessageType_ThpQrCodeTag\x10\x80\x08\ + \x12#\n\x1eThpMessageType_ThpQrCodeSecret\x10\x81\x08\x12!\n\x1cThpMessa\ + geType_ThpNfcTagHost\x10\x88\x08\x12#\n\x1eThpMessageType_ThpNfcTagTrezo\ + r\x10\x89\x08\"\x04\x08\0\x10\x13\"\x04\x08\x15\x10\x19\"\x05\x08\x1b\ + \x10\xe7\x07\"\x06\x08\xe8\x07\x10\xe8\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\x10ThpP\ + airingMethod\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\x80\xa6\x1d\x01\ "; /// `FileDescriptorProto` object which was a source for this generated file @@ -4144,7 +4330,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(),