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

fixup! temp: update pairing process, part 1

Browse Source
This commit is contained in:
M1nd3r 2025-01-27 14:40:21 +01:00
parent a82a0b3af2
commit ca6f699526
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ enum ThpMessageType {
ThpMessageType_ThpCreateNewSession = 1000 [(bitcoin_only)=true]; ThpMessageType_ThpCreateNewSession = 1000 [(bitcoin_only)=true];
ThpMessageType_ThpPairingRequest = 1006 [(bitcoin_only) = true]; ThpMessageType_ThpPairingRequest = 1006 [(bitcoin_only) = true];
ThpMessageType_ThpPairingRequestAck = 1007 [(bitcoin_only) = true]; ThpMessageType_ThpPairingRequestApproved = 1007 [(bitcoin_only) = true];
ThpMessageType_ThpSelectMethod = 1008 [(bitcoin_only) = true]; ThpMessageType_ThpSelectMethod = 1008 [(bitcoin_only) = true];
ThpMessageType_ThpPairingPreparationsFinished = 1009 [(bitcoin_only) = true]; ThpMessageType_ThpPairingPreparationsFinished = 1009 [(bitcoin_only) = true];
ThpMessageType_ThpCredentialRequest = 1010 [(bitcoin_only) = true]; ThpMessageType_ThpCredentialRequest = 1010 [(bitcoin_only) = true];

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

@ -4,7 +4,7 @@
ThpCreateNewSession = 1000 ThpCreateNewSession = 1000
ThpPairingRequest = 1006 ThpPairingRequest = 1006
ThpPairingRequestAck = 1007 ThpPairingRequestApproved = 1007
ThpSelectMethod = 1008 ThpSelectMethod = 1008
ThpPairingPreparationsFinished = 1009 ThpPairingPreparationsFinished = 1009
ThpCredentialRequest = 1010 ThpCredentialRequest = 1010

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

@ -354,7 +354,7 @@ if TYPE_CHECKING:
class ThpMessageType(IntEnum): class ThpMessageType(IntEnum):
ThpCreateNewSession = 1000 ThpCreateNewSession = 1000
ThpPairingRequest = 1006 ThpPairingRequest = 1006
ThpPairingRequestAck = 1007 ThpPairingRequestApproved = 1007
ThpSelectMethod = 1008 ThpSelectMethod = 1008
ThpPairingPreparationsFinished = 1009 ThpPairingPreparationsFinished = 1009
ThpCredentialRequest = 1010 ThpCredentialRequest = 1010

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

@ -407,7 +407,7 @@ class TezosBallotType(IntEnum):
class ThpMessageType(IntEnum): class ThpMessageType(IntEnum):
ThpCreateNewSession = 1000 ThpCreateNewSession = 1000
ThpPairingRequest = 1006 ThpPairingRequest = 1006
ThpPairingRequestAck = 1007 ThpPairingRequestApproved = 1007
ThpSelectMethod = 1008 ThpSelectMethod = 1008
ThpPairingPreparationsFinished = 1009 ThpPairingPreparationsFinished = 1009
ThpCredentialRequest = 1010 ThpCredentialRequest = 1010
@ -7979,7 +7979,7 @@ class ThpPairingRequest(protobuf.MessageType):
class ThpPairingRequestAck(protobuf.MessageType): class ThpPairingRequestAck(protobuf.MessageType):
MESSAGE_WIRE_TYPE = 1007 MESSAGE_WIRE_TYPE = None
class ThpSelectMethod(protobuf.MessageType): class ThpSelectMethod(protobuf.MessageType):

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

@ -3858,8 +3858,8 @@ pub enum ThpMessageType {
ThpMessageType_ThpCreateNewSession = 1000, ThpMessageType_ThpCreateNewSession = 1000,
// @@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 = 1006, ThpMessageType_ThpPairingRequest = 1006,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestAck) // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingRequestApproved)
ThpMessageType_ThpPairingRequestAck = 1007, ThpMessageType_ThpPairingRequestApproved = 1007,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpSelectMethod) // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpSelectMethod)
ThpMessageType_ThpSelectMethod = 1008, ThpMessageType_ThpSelectMethod = 1008,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingPreparationsFinished) // @@protoc_insertion_point(enum_value:hw.trezor.messages.thp.ThpMessageType.ThpMessageType_ThpPairingPreparationsFinished)
@ -3903,7 +3903,7 @@ impl ::protobuf::Enum for ThpMessageType {
match value { match value {
1000 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession), 1000 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession),
1006 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), 1006 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest),
1007 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestAck), 1007 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestApproved),
1008 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod), 1008 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpSelectMethod),
1009 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished), 1009 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished),
1010 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest), 1010 => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest),
@ -3927,7 +3927,7 @@ impl ::protobuf::Enum for ThpMessageType {
match str { match str {
"ThpMessageType_ThpCreateNewSession" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession), "ThpMessageType_ThpCreateNewSession" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCreateNewSession),
"ThpMessageType_ThpPairingRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest), "ThpMessageType_ThpPairingRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequest),
"ThpMessageType_ThpPairingRequestAck" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingRequestAck), "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),
"ThpMessageType_ThpPairingPreparationsFinished" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished), "ThpMessageType_ThpPairingPreparationsFinished" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished),
"ThpMessageType_ThpCredentialRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest), "ThpMessageType_ThpCredentialRequest" => ::std::option::Option::Some(ThpMessageType::ThpMessageType_ThpCredentialRequest),
@ -3950,7 +3950,7 @@ impl ::protobuf::Enum for ThpMessageType {
const VALUES: &'static [ThpMessageType] = &[ const VALUES: &'static [ThpMessageType] = &[
ThpMessageType::ThpMessageType_ThpCreateNewSession, ThpMessageType::ThpMessageType_ThpCreateNewSession,
ThpMessageType::ThpMessageType_ThpPairingRequest, ThpMessageType::ThpMessageType_ThpPairingRequest,
ThpMessageType::ThpMessageType_ThpPairingRequestAck, ThpMessageType::ThpMessageType_ThpPairingRequestApproved,
ThpMessageType::ThpMessageType_ThpSelectMethod, ThpMessageType::ThpMessageType_ThpSelectMethod,
ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished, ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished,
ThpMessageType::ThpMessageType_ThpCredentialRequest, ThpMessageType::ThpMessageType_ThpCredentialRequest,
@ -3979,7 +3979,7 @@ impl ::protobuf::EnumFull for ThpMessageType {
let index = match self { let index = match self {
ThpMessageType::ThpMessageType_ThpCreateNewSession => 0, ThpMessageType::ThpMessageType_ThpCreateNewSession => 0,
ThpMessageType::ThpMessageType_ThpPairingRequest => 1, ThpMessageType::ThpMessageType_ThpPairingRequest => 1,
ThpMessageType::ThpMessageType_ThpPairingRequestAck => 2, ThpMessageType::ThpMessageType_ThpPairingRequestApproved => 2,
ThpMessageType::ThpMessageType_ThpSelectMethod => 3, ThpMessageType::ThpMessageType_ThpSelectMethod => 3,
ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 4, ThpMessageType::ThpMessageType_ThpPairingPreparationsFinished => 4,
ThpMessageType::ThpMessageType_ThpCredentialRequest => 5, ThpMessageType::ThpMessageType_ThpCredentialRequest => 5,
@ -4132,31 +4132,31 @@ static file_descriptor_proto_data: &'static [u8] = b"\
\x04\x98\xb2\x19\x01\"\xa8\x01\n\x1eThpAuthenticatedCredentialData\x12,\ \x04\x98\xb2\x19\x01\"\xa8\x01\n\x1eThpAuthenticatedCredentialData\x12,\
\n\x12host_static_pubkey\x18\x01\x20\x01(\x0cR\x10hostStaticPubkey\x12R\ \n\x12host_static_pubkey\x18\x01\x20\x01(\x0cR\x10hostStaticPubkey\x12R\
\n\rcred_metadata\x18\x02\x20\x01(\x0b2-.hw.trezor.messages.thp.ThpCrede\ \n\rcred_metadata\x18\x02\x20\x01(\x0b2-.hw.trezor.messages.thp.ThpCrede\
ntialMetadataR\x0ccredMetadata:\x04\x98\xb2\x19\x01*\xe6\x06\n\x0eThpMes\ ntialMetadataR\x0ccredMetadata:\x04\x98\xb2\x19\x01*\xeb\x06\n\x0eThpMes\
sageType\x12-\n\"ThpMessageType_ThpCreateNewSession\x10\xe8\x07\x1a\x04\ sageType\x12-\n\"ThpMessageType_ThpCreateNewSession\x10\xe8\x07\x1a\x04\
\x80\xa6\x1d\x01\x12+\n\x20ThpMessageType_ThpPairingRequest\x10\xee\x07\ \x80\xa6\x1d\x01\x12+\n\x20ThpMessageType_ThpPairingRequest\x10\xee\x07\
\x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMessageType_ThpPairingRequestAck\x10\ \x1a\x04\x80\xa6\x1d\x01\x123\n(ThpMessageType_ThpPairingRequestApproved\
\xef\x07\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMessageType_ThpSelectMetho\ \x10\xef\x07\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMessageType_ThpSelectM\
d\x10\xf0\x07\x1a\x04\x80\xa6\x1d\x01\x128\n-ThpMessageType_ThpPairingPr\ ethod\x10\xf0\x07\x1a\x04\x80\xa6\x1d\x01\x128\n-ThpMessageType_ThpPairi\
eparationsFinished\x10\xf1\x07\x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMessage\ ngPreparationsFinished\x10\xf1\x07\x1a\x04\x80\xa6\x1d\x01\x12.\n#ThpMes\
Type_ThpCredentialRequest\x10\xf2\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n$Thp\ sageType_ThpCredentialRequest\x10\xf2\x07\x1a\x04\x80\xa6\x1d\x01\x12/\n\
MessageType_ThpCredentialResponse\x10\xf3\x07\x1a\x04\x80\xa6\x1d\x01\ $ThpMessageType_ThpCredentialResponse\x10\xf3\x07\x1a\x04\x80\xa6\x1d\
\x12'\n\x1cThpMessageType_ThpEndRequest\x10\xf4\x07\x1a\x04\x80\xa6\x1d\ \x01\x12'\n\x1cThpMessageType_ThpEndRequest\x10\xf4\x07\x1a\x04\x80\xa6\
\x01\x12(\n\x1dThpMessageType_ThpEndResponse\x10\xf5\x07\x1a\x04\x80\xa6\ \x1d\x01\x12(\n\x1dThpMessageType_ThpEndResponse\x10\xf5\x07\x1a\x04\x80\
\x1d\x01\x120\n%ThpMessageType_ThpCodeEntryCommitment\x10\xf8\x07\x1a\ \xa6\x1d\x01\x120\n%ThpMessageType_ThpCodeEntryCommitment\x10\xf8\x07\
\x04\x80\xa6\x1d\x01\x12/\n$ThpMessageType_ThpCodeEntryChallenge\x10\xf9\ \x1a\x04\x80\xa6\x1d\x01\x12/\n$ThpMessageType_ThpCodeEntryChallenge\x10\
\x07\x1a\x04\x80\xa6\x1d\x01\x121\n&ThpMessageType_ThpCodeEntryCpaceTrez\ \xf9\x07\x1a\x04\x80\xa6\x1d\x01\x121\n&ThpMessageType_ThpCodeEntryCpace\
or\x10\xfa\x07\x1a\x04\x80\xa6\x1d\x01\x122\n'ThpMessageType_ThpCodeEntr\ Trezor\x10\xfa\x07\x1a\x04\x80\xa6\x1d\x01\x122\n'ThpMessageType_ThpCode\
yCpaceHostTag\x10\xfb\x07\x1a\x04\x80\xa6\x1d\x01\x12,\n!ThpMessageType_\ EntryCpaceHostTag\x10\xfb\x07\x1a\x04\x80\xa6\x1d\x01\x12,\n!ThpMessageT\
ThpCodeEntrySecret\x10\xfc\x07\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bThpMess\ ype_ThpCodeEntrySecret\x10\xfc\x07\x1a\x04\x80\xa6\x1d\x01\x12&\n\x1bThp\
ageType_ThpQrCodeTag\x10\x80\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eThpMe\ MessageType_ThpQrCodeTag\x10\x80\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\x1eT\
ssageType_ThpQrCodeSecret\x10\x81\x08\x1a\x04\x80\xa6\x1d\x01\x12'\n\x1c\ hpMessageType_ThpQrCodeSecret\x10\x81\x08\x1a\x04\x80\xa6\x1d\x01\x12'\n\
ThpMessageType_ThpNfcTagHost\x10\x88\x08\x1a\x04\x80\xa6\x1d\x01\x12)\n\ \x1cThpMessageType_ThpNfcTagHost\x10\x88\x08\x1a\x04\x80\xa6\x1d\x01\x12\
\x1eThpMessageType_ThpNfcTagTrezor\x10\x89\x08\x1a\x04\x80\xa6\x1d\x01\"\ )\n\x1eThpMessageType_ThpNfcTagTrezor\x10\x89\x08\x1a\x04\x80\xa6\x1d\
\x05\x08\0\x10\xe7\x07\"\t\x08\xcc\x08\x10\xff\xff\xff\xff\x07*G\n\x10Th\ \x01\"\x05\x08\0\x10\xe7\x07\"\t\x08\xcc\x08\x10\xff\xff\xff\xff\x07*G\n\
pPairingMethod\x12\x0f\n\x0bSkipPairing\x10\x01\x12\r\n\tCodeEntry\x10\ \x10ThpPairingMethod\x12\x0f\n\x0bSkipPairing\x10\x01\x12\r\n\tCodeEntry\
\x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03NFC\x10\x04B;\n#com.satoshil\ \x10\x02\x12\n\n\x06QrCode\x10\x03\x12\x07\n\x03NFC\x10\x04B;\n#com.sato\
abs.trezor.lib.protobufB\x10TrezorMessageThp\x80\xa6\x1d\x01\ shilabs.trezor.lib.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