arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-02 11:58:32 +00:00
Code Issues Releases Wiki Activity

chore(common): add ButtonAck to ThpMessageType

Browse Source 
[no changelog]
This commit is contained in:
M1nd3r 2025-07-21 10:29:22 +02:00 committed by Petr Sedláček
parent a0c604cb26
commit 3efcd0b601
5 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/protob/messages-thp.proto
View File

@ -20,7 +20,8 @@ enum ThpMessageType {
ThpMessageType_Cancel = 20; ThpMessageType_Cancel = 20;
reserved 21 to 25; reserved 21 to 25;
ThpMessageType_ButtonRequest = 26; ThpMessageType_ButtonRequest = 26;
reserved 27 to 999; ThpMessageType_ButtonAck = 27;
reserved 28 to 999;
reserved 1000; // MessageType_ThpCreateNewSession reserved 1000; // MessageType_ThpCreateNewSession
reserved 1001 to 1007; // never appeared in a release, reserved for future use reserved 1001 to 1007; // never appeared in a release, reserved for future use

1
core/src/trezor/enums/ThpMessageType.py generated
View File

@ -6,6 +6,7 @@ from trezor import utils
Cancel = 20 Cancel = 20
ButtonRequest = 26 ButtonRequest = 26
ButtonAck = 27
if utils.USE_THP: if utils.USE_THP:
ThpPairingRequest = 1008 ThpPairingRequest = 1008
ThpPairingRequestApproved = 1009 ThpPairingRequestApproved = 1009

1
core/src/trezor/enums/__init__.py generated
View File

@ -345,6 +345,7 @@ if TYPE_CHECKING:
class ThpMessageType(IntEnum): class ThpMessageType(IntEnum):
Cancel = 20 Cancel = 20
ButtonRequest = 26 ButtonRequest = 26
ButtonAck = 27
ThpPairingRequest = 1008 ThpPairingRequest = 1008
ThpPairingRequestApproved = 1009 ThpPairingRequestApproved = 1009
ThpSelectMethod = 1010 ThpSelectMethod = 1010

1
python/src/trezorlib/messages.py generated
View File

@ -396,6 +396,7 @@ class TezosBallotType(IntEnum):
class ThpMessageType(IntEnum): class ThpMessageType(IntEnum):
Cancel = 20 Cancel = 20
ButtonRequest = 26 ButtonRequest = 26
ButtonAck = 27
ThpPairingRequest = 1008 ThpPairingRequest = 1008
ThpPairingRequestApproved = 1009 ThpPairingRequestApproved = 1009
ThpSelectMethod = 1010 ThpSelectMethod = 1010

85
rust/trezor-client/src/protos/generated/messages_thp.rs generated
View File

@ -3984,6 +3984,8 @@ pub enum ThpMessageType {
ThpMessageType_Cancel = 20, ThpMessageType_Cancel = 20,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ButtonRequest) // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ButtonRequest)
ThpMessageType_ButtonRequest = 26, ThpMessageType_ButtonRequest = 26,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ButtonAck)
ThpMessageType_ButtonAck = 27,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequest) // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequest)
ThpMessageType_ThpPairingRequest = 1008, ThpMessageType_ThpPairingRequest = 1008,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestApproved) // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestApproved)
@ -4031,6 +4033,7 @@ impl ::protobuf::Enum for ThpMessageType {
match value { match value {
20 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_Cancel), 20 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_Cancel),
26 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonRequest), 26 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonRequest),
27 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonAck),
1008 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), 1008 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest),
1009 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved), 1009 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved),
1010 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), 1010 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod),
@ -4056,6 +4059,7 @@ impl ::protobuf::Enum for ThpMessageType {
match str { match str {
"ThpMessageType_Cancel" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_Cancel), "ThpMessageType_Cancel" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_Cancel),
"ThpMessageType_ButtonRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonRequest), "ThpMessageType_ButtonRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonRequest),
"ThpMessageType_ButtonAck" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ButtonAck),
"ThpMessageType_ThpPairingRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), "ThpMessageType_ThpPairingRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest),
"ThpMessageType_ThpPairingRequestApproved" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved), "ThpMessageType_ThpPairingRequestApproved" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved),
"ThpMessageType_ThpSelectMethod" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), "ThpMessageType_ThpSelectMethod" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod),
@ -4080,6 +4084,7 @@ impl ::protobuf::Enum for ThpMessageType {
const VALUES: &'static [ThpMessageType] = &[ const VALUES: &'static [ThpMessageType] = &[
ThpMessageType::ThpMessageType_Cancel, ThpMessageType::ThpMessageType_Cancel,
ThpMessageType::ThpMessageType_ButtonRequest, ThpMessageType::ThpMessageType_ButtonRequest,
ThpMessageType::ThpMessageType_ButtonAck,
ThpMessageType::ThpMessageType_ThpPairingRequest, ThpMessageType::ThpMessageType_ThpPairingRequest,
ThpMessageType::ThpMessageType_ThpPairingRequestApproved, ThpMessageType::ThpMessageType_ThpPairingRequestApproved,
ThpMessageType::ThpMessageType_ThpSelectMethod, ThpMessageType::ThpMessageType_ThpSelectMethod,
@ -4110,23 +4115,24 @@ impl ::protobuf::EnumFull for ThpMessageType {
let index = match self { let index = match self {
ThpMessageType::ThpMessageType_Cancel => 0, ThpMessageType::ThpMessageType_Cancel => 0,
ThpMessageType::ThpMessageType_ButtonRequest => 1, ThpMessageType::ThpMessageType_ButtonRequest => 1,
ThpMessageType::ThpMessageType_ThpPairingRequest => 2, ThpMessageType::ThpMessageType_ButtonAck => 2,
ThpMessageType::ThpMessageType_ThpPairingRequestApproved => 3, ThpMessageType::ThpMessageType_ThpPairingRequest => 3,
ThpMessageType::ThpMessageType_ThpSelectMethod => 4, ThpMessageType::ThpMessageType_ThpPairingRequestApproved => 4,
ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 5, ThpMessageType::ThpMessageType_ThpSelectMethod => 5,
ThpMessageType::ThpMessageType_ThpCredentialRequest => 6, ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 6,
ThpMessageType::ThpMessageType_ThpCredentialResponse => 7, ThpMessageType::ThpMessageType_ThpCredentialRequest => 7,
ThpMessageType::ThpMessageType_ThpEndRequest => 8, ThpMessageType::ThpMessageType_ThpCredentialResponse => 8,
ThpMessageType::ThpMessageType_ThpEndResponse => 9, ThpMessageType::ThpMessageType_ThpEndRequest => 9,
ThpMessageType::ThpMessageType_ThpCodeEntryCommitment => 10, ThpMessageType::ThpMessageType_ThpEndResponse => 10,
ThpMessageType::ThpMessageType_ThpCodeEntryChallenge => 11, ThpMessageType::ThpMessageType_ThpCodeEntryCommitment => 11,
ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor => 12, ThpMessageType::ThpMessageType_ThpCodeEntryChallenge => 12,
ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag => 13, ThpMessageType::ThpMessageType_ThpCodeEntryCpaceTrezor => 13,
ThpMessageType::ThpMessageType_ThpCodeEntrySecret => 14, ThpMessageType::ThpMessageType_ThpCodeEntryCpaceHostTag => 14,
ThpMessageType::ThpMessageType_ThpQrCodeTag => 15, ThpMessageType::ThpMessageType_ThpCodeEntrySecret => 15,
ThpMessageType::ThpMessageType_ThpQrCodeSecret => 16, ThpMessageType::ThpMessageType_ThpQrCodeTag => 16,
ThpMessageType::ThpMessageType_ThpNfcTagHost => 17, ThpMessageType::ThpMessageType_ThpQrCodeSecret => 17,
ThpMessageType::ThpMessageType_ThpNfcTagTrezor => 18, ThpMessageType::ThpMessageType_ThpNfcTagHost => 18,
ThpMessageType::ThpMessageType_ThpNfcTagTrezor => 19,
}; };
Self::enum_descriptor().value_by_index(index) Self::enum_descriptor().value_by_index(index)
} }
@ -4266,29 +4272,30 @@ static file_descriptor_proto_data: &'static [u8] = b"\
\x01\n\x1eThpAuthenticatedCredentialData\x12,\n\x12host_static_pubkey\ \x01\n\x1eThpAuthenticatedCredentialData\x12,\n\x12host_static_pubkey\
\x18\x01\x20\x02(\x0cR\x10hostStaticPubkey\x12R\n\rcred_metadata\x18\x02\ \x18\x01\x20\x02(\x0cR\x10hostStaticPubkey\x12R\n\rcred_metadata\x18\x02\
\x20\x02(\x0b2-.hw.trezor.messages.thp.ThpCredentialMetadataR\x0ccredMet\ \x20\x02(\x0b2-.hw.trezor.messages.thp.ThpCredentialMetadataR\x0ccredMet\
adata:\x04\x98\xb2\x19\x01*\xdd\x06\n\x0eThpMessageType\x12\x19\n\x15Thp\ adata:\x04\x98\xb2\x19\x01*\xfb\x06\n\x0eThpMessageType\x12\x19\n\x15Thp\
MessageType_Cancel\x10\x14\x12\x20\n\x1cThpMessageType_ButtonRequest\x10\ MessageType_Cancel\x10\x14\x12\x20\n\x1cThpMessageType_ButtonRequest\x10\
\x1a\x12%\n\x20ThpMessageType_ThpPairingRequest\x10\xf0\x07\x12-\n(ThpMe\ \x1a\x12\x1c\n\x18ThpMessageType_ButtonAck\x10\x1b\x12%\n\x20ThpMessageT\
ssageType_ThpPairingRequestApproved\x10\xf1\x07\x12#\n\x1eThpMessageType\ ype_ThpPairingRequest\x10\xf0\x07\x12-\n(ThpMessageType_ThpPairingReques\
_ThpSelectMethod\x10\xf2\x07\x122\n-ThpMessageType_ThpPairingPreparation\ tApproved\x10\xf1\x07\x12#\n\x1eThpMessageType_ThpSelectMethod\x10\xf2\
sFinished\x10\xf3\x07\x12(\n#ThpMessageType_ThpCredentialRequest\x10\xf8\ \x07\x122\n-ThpMessageType_ThpPairingPreparationsFinished\x10\xf3\x07\
\x07\x12)\n$ThpMessageType_ThpCredentialResponse\x10\xf9\x07\x12!\n\x1cT\ \x12(\n#ThpMessageType_ThpCredentialRequest\x10\xf8\x07\x12)\n$ThpMessag\
hpMessageType_ThpEndRequest\x10\xfa\x07\x12\"\n\x1dThpMessageType_ThpEnd\ eType_ThpCredentialResponse\x10\xf9\x07\x12!\n\x1cThpMessageType_ThpEndR\
Response\x10\xfb\x07\x12*\n%ThpMessageType_ThpCodeEntryCommitment\x10\ equest\x10\xfa\x07\x12\"\n\x1dThpMessageType_ThpEndResponse\x10\xfb\x07\
\x80\x08\x12)\n$ThpMessageType_ThpCodeEntryChallenge\x10\x81\x08\x12+\n&\ \x12*\n%ThpMessageType_ThpCodeEntryCommitment\x10\x80\x08\x12)\n$ThpMess\
ThpMessageType_ThpCodeEntryCpaceTrezor\x10\x82\x08\x12,\n'ThpMessageType\ ageType_ThpCodeEntryChallenge\x10\x81\x08\x12+\n&ThpMessageType_ThpCodeE\
_ThpCodeEntryCpaceHostTag\x10\x83\x08\x12&\n!ThpMessageType_ThpCodeEntry\ ntryCpaceTrezor\x10\x82\x08\x12,\n'ThpMessageType_ThpCodeEntryCpaceHostT\
Secret\x10\x84\x08\x12\x20\n\x1bThpMessageType_ThpQrCodeTag\x10\x88\x08\ ag\x10\x83\x08\x12&\n!ThpMessageType_ThpCodeEntrySecret\x10\x84\x08\x12\
\x12#\n\x1eThpMessageType_ThpQrCodeSecret\x10\x89\x08\x12!\n\x1cThpMessa\ \x20\n\x1bThpMessageType_ThpQrCodeTag\x10\x88\x08\x12#\n\x1eThpMessageTy\
geType_ThpNfcTagHost\x10\x90\x08\x12#\n\x1eThpMessageType_ThpNfcTagTrezo\ pe_ThpQrCodeSecret\x10\x89\x08\x12!\n\x1cThpMessageType_ThpNfcTagHost\
r\x10\x91\x08\x1a\x04\xd0\xf3\x18\x01\"\x04\x08\0\x10\x13\"\x04\x08\x15\ \x10\x90\x08\x12#\n\x1eThpMessageType_ThpNfcTagTrezor\x10\x91\x08\x1a\
\x10\x19\"\x05\x08\x1b\x10\xe7\x07\"\x06\x08\xe8\x07\x10\xe8\x07\"\x06\ \x04\xd0\xf3\x18\x01\"\x04\x08\0\x10\x13\"\x04\x08\x15\x10\x19\"\x05\x08\
\x08\xe9\x07\x10\xef\x07\"\x06\x08\xf4\x07\x10\xf7\x07\"\x06\x08\xfc\x07\ \x1c\x10\xe7\x07\"\x06\x08\xe8\x07\x10\xe8\x07\"\x06\x08\xe9\x07\x10\xef\
\x10\xff\x07\"\x06\x08\x85\x08\x10\x87\x08\"\x06\x08\x8a\x08\x10\x8f\x08\ \x07\"\x06\x08\xf4\x07\x10\xf7\x07\"\x06\x08\xfc\x07\x10\xff\x07\"\x06\
\"\x06\x08\x92\x08\x10\xcb\x08\"\t\x08\xcc\x08\x10\xff\xff\xff\xff\x07*G\ \x08\x85\x08\x10\x87\x08\"\x06\x08\x8a\x08\x10\x8f\x08\"\x06\x08\x92\x08\
\n\x10ThpPairingMethod\x12\x0f\n\x0bSkipPairing\x10\x01\x12\r\n\tCodeEnt\ \x10\xcb\x08\"\t\x08\xcc\x08\x10\xff\xff\xff\xff\x07*G\n\x10ThpPairingMe\
ry\x10\x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03NFC\x10\x04B;\n#com.sa\ thod\x12\x0f\n\x0bSkipPairing\x10\x01\x12\r\n\tCodeEntry\x10\x02\x12\n\n\
toshilabs.trezor.lib.protobufB\x10TrezorMessageThp\x80\xa6\x1d\x01\ \x06QrCode\x10\x03\x12\x07\n\x03NFC\x10\x04B;\n#com.satoshilabs.trezor.l\
ib.protobufB\x10TrezorMessageThp\x80\xa6\x1d\x01\
"; ";
/// `FileDescriptorProto` object which was a source for this generated file /// `FileDescriptorProto` object which was a source for this generated file