arno
/
trezor-firmware
mirror of https://github.com/trezor/trezor-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix common prebuild protobuf naming error

Browse Source
M1nd3r/thp5
M1nd3r 2 months ago
parent 4c2e678787
commit cac3cf5cca
4 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File

8
common/protob/messages-thp.proto
Unescape View File

@ -159,7 +159,7 @@ message ThpCredentialRequest {
/** /**
* Response: Trezor issues a new pairing credential. * Response: Trezor issues a new pairing credential.
* @next ThpCredentialRequest * @next ThpCredentialRequest
* @next EndRequest * @next ThpEndRequest
*/ */
message ThpCredentialResponse { message ThpCredentialResponse {
optional bytes trezor_static_pubkey = 1; // Trezor's static public key used in the handshake. optional bytes trezor_static_pubkey = 1; // Trezor's static public key used in the handshake.
@ -169,12 +169,12 @@ message ThpCredentialResponse {
/** /**
* Request: Host requests transition to the encrypted traffic phase. * Request: Host requests transition to the encrypted traffic phase.
* @start * @start
* @next EndResponse * @next ThpEndResponse
*/ */
message EndRequest {} message ThpEndRequest {}
/** /**
* Response: Trezor approves transition to the encrypted traffic phase * Response: Trezor approves transition to the encrypted traffic phase
* @end * @end
*/ */
message EndResponse {} message ThpEndResponse {}

8
core/src/trezor/messages.py generated
Unescape View File

@ -6350,16 +6350,16 @@ if TYPE_CHECKING:
def is_type_of(cls, msg: Any) -> TypeGuard["ThpCredentialResponse"]: def is_type_of(cls, msg: Any) -> TypeGuard["ThpCredentialResponse"]:
return isinstance(msg, cls) return isinstance(msg, cls)
class EndRequest(protobuf.MessageType): class ThpEndRequest(protobuf.MessageType):
@classmethod @classmethod
def is_type_of(cls, msg: Any) -> TypeGuard["EndRequest"]: def is_type_of(cls, msg: Any) -> TypeGuard["ThpEndRequest"]:
return isinstance(msg, cls) return isinstance(msg, cls)
class EndResponse(protobuf.MessageType): class ThpEndResponse(protobuf.MessageType):
@classmethod @classmethod
def is_type_of(cls, msg: Any) -> TypeGuard["EndResponse"]: def is_type_of(cls, msg: Any) -> TypeGuard["ThpEndResponse"]:
return isinstance(msg, cls) return isinstance(msg, cls)
class WebAuthnListResidentCredentials(protobuf.MessageType): class WebAuthnListResidentCredentials(protobuf.MessageType):

8
python/src/trezorlib/messages.py generated
Unescape View File

@ -7986,12 +7986,12 @@ class ThpCredentialResponse(protobuf.MessageType):
self.credential = credential self.credential = credential
class EndRequest(protobuf.MessageType): class ThpEndRequest(protobuf.MessageType):
MESSAGE_WIRE_TYPE = None MESSAGE_WIRE_TYPE = 1004
class EndResponse(protobuf.MessageType): class ThpEndResponse(protobuf.MessageType):
MESSAGE_WIRE_TYPE = None MESSAGE_WIRE_TYPE = 1005
class WebAuthnListResidentCredentials(protobuf.MessageType): class WebAuthnListResidentCredentials(protobuf.MessageType):

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

@ -2938,38 +2938,38 @@ impl ::protobuf::reflect::ProtobufValue for ThpCredentialResponse {
type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>; type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
} }
// @@protoc_insertion_point(message:hw.trezor.messages.thp.EndRequest) // @@protoc_insertion_point(message:hw.trezor.messages.thp.ThpEndRequest)
#[derive(PartialEq,Clone,Default,Debug)] #[derive(PartialEq,Clone,Default,Debug)]
pub struct EndRequest { pub struct ThpEndRequest {
// special fields // special fields
// @@protoc_insertion_point(special_field:hw.trezor.messages.thp.EndRequest.special_fields) // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.ThpEndRequest.special_fields)
pub special_fields: ::protobuf::SpecialFields, pub special_fields: ::protobuf::SpecialFields,
} }
impl<'a> ::std::default::Default for &'a EndRequest { impl<'a> ::std::default::Default for &'a ThpEndRequest {
fn default() -> &'a EndRequest { fn default() -> &'a ThpEndRequest {
<EndRequest as ::protobuf::Message>::default_instance() <ThpEndRequest as ::protobuf::Message>::default_instance()
} }
} }
impl EndRequest { impl ThpEndRequest {
pub fn new() -> EndRequest { pub fn new() -> ThpEndRequest {
::std::default::Default::default() ::std::default::Default::default()
} }
fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
let mut fields = ::std::vec::Vec::with_capacity(0); let mut fields = ::std::vec::Vec::with_capacity(0);
let mut oneofs = ::std::vec::Vec::with_capacity(0); let mut oneofs = ::std::vec::Vec::with_capacity(0);
::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<EndRequest>( ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<ThpEndRequest>(
"EndRequest", "ThpEndRequest",
fields, fields,
oneofs, oneofs,
) )
} }
} }
impl ::protobuf::Message for EndRequest { impl ::protobuf::Message for ThpEndRequest {
const NAME: &'static str = "EndRequest"; const NAME: &'static str = "ThpEndRequest";
fn is_initialized(&self) -> bool { fn is_initialized(&self) -> bool {
true true
@ -3008,71 +3008,71 @@ impl ::protobuf::Message for EndRequest {
&mut self.special_fields &mut self.special_fields
} }
fn new() -> EndRequest { fn new() -> ThpEndRequest {
EndRequest::new() ThpEndRequest::new()
} }
fn clear(&mut self) { fn clear(&mut self) {
self.special_fields.clear(); self.special_fields.clear();
} }
fn default_instance() -> &'static EndRequest { fn default_instance() -> &'static ThpEndRequest {
static instance: EndRequest = EndRequest { static instance: ThpEndRequest = ThpEndRequest {
special_fields: ::protobuf::SpecialFields::new(), special_fields: ::protobuf::SpecialFields::new(),
}; };
&instance &instance
} }
} }
impl ::protobuf::MessageFull for EndRequest { impl ::protobuf::MessageFull for ThpEndRequest {
fn descriptor() -> ::protobuf::reflect::MessageDescriptor { fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
descriptor.get(|| file_descriptor().message_by_package_relative_name("EndRequest").unwrap()).clone() descriptor.get(|| file_descriptor().message_by_package_relative_name("ThpEndRequest").unwrap()).clone()
} }
} }
impl ::std::fmt::Display for EndRequest { impl ::std::fmt::Display for ThpEndRequest {
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
::protobuf::text_format::fmt(self, f) ::protobuf::text_format::fmt(self, f)
} }
} }
impl ::protobuf::reflect::ProtobufValue for EndRequest { impl ::protobuf::reflect::ProtobufValue for ThpEndRequest {
type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>; type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
} }
// @@protoc_insertion_point(message:hw.trezor.messages.thp.EndResponse) // @@protoc_insertion_point(message:hw.trezor.messages.thp.ThpEndResponse)
#[derive(PartialEq,Clone,Default,Debug)] #[derive(PartialEq,Clone,Default,Debug)]
pub struct EndResponse { pub struct ThpEndResponse {
// special fields // special fields
// @@protoc_insertion_point(special_field:hw.trezor.messages.thp.EndResponse.special_fields) // @@protoc_insertion_point(special_field:hw.trezor.messages.thp.ThpEndResponse.special_fields)
pub special_fields: ::protobuf::SpecialFields, pub special_fields: ::protobuf::SpecialFields,
} }
impl<'a> ::std::default::Default for &'a EndResponse { impl<'a> ::std::default::Default for &'a ThpEndResponse {
fn default() -> &'a EndResponse { fn default() -> &'a ThpEndResponse {
<EndResponse as ::protobuf::Message>::default_instance() <ThpEndResponse as ::protobuf::Message>::default_instance()
} }
} }
impl EndResponse { impl ThpEndResponse {
pub fn new() -> EndResponse { pub fn new() -> ThpEndResponse {
::std::default::Default::default() ::std::default::Default::default()
} }
fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
let mut fields = ::std::vec::Vec::with_capacity(0); let mut fields = ::std::vec::Vec::with_capacity(0);
let mut oneofs = ::std::vec::Vec::with_capacity(0); let mut oneofs = ::std::vec::Vec::with_capacity(0);
::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<EndResponse>( ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<ThpEndResponse>(
"EndResponse", "ThpEndResponse",
fields, fields,
oneofs, oneofs,
) )
} }
} }
impl ::protobuf::Message for EndResponse { impl ::protobuf::Message for ThpEndResponse {
const NAME: &'static str = "EndResponse"; const NAME: &'static str = "ThpEndResponse";
fn is_initialized(&self) -> bool { fn is_initialized(&self) -> bool {
true true
@ -3111,36 +3111,36 @@ impl ::protobuf::Message for EndResponse {
&mut self.special_fields &mut self.special_fields
} }
fn new() -> EndResponse { fn new() -> ThpEndResponse {
EndResponse::new() ThpEndResponse::new()
} }
fn clear(&mut self) { fn clear(&mut self) {
self.special_fields.clear(); self.special_fields.clear();
} }
fn default_instance() -> &'static EndResponse { fn default_instance() -> &'static ThpEndResponse {
static instance: EndResponse = EndResponse { static instance: ThpEndResponse = ThpEndResponse {
special_fields: ::protobuf::SpecialFields::new(), special_fields: ::protobuf::SpecialFields::new(),
}; };
&instance &instance
} }
} }
impl ::protobuf::MessageFull for EndResponse { impl ::protobuf::MessageFull for ThpEndResponse {
fn descriptor() -> ::protobuf::reflect::MessageDescriptor { fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
descriptor.get(|| file_descriptor().message_by_package_relative_name("EndResponse").unwrap()).clone() descriptor.get(|| file_descriptor().message_by_package_relative_name("ThpEndResponse").unwrap()).clone()
} }
} }
impl ::std::fmt::Display for EndResponse { impl ::std::fmt::Display for ThpEndResponse {
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
::protobuf::text_format::fmt(self, f) ::protobuf::text_format::fmt(self, f)
} }
} }
impl ::protobuf::reflect::ProtobufValue for EndResponse { impl ::protobuf::reflect::ProtobufValue for ThpEndResponse {
type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>; type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
} }
@ -3252,11 +3252,11 @@ static file_descriptor_proto_data: &'static [u8] = b"\
tialRequest\x12,\n\x12host_static_pubkey\x18\x01\x20\x01(\x0cR\x10hostSt\ tialRequest\x12,\n\x12host_static_pubkey\x18\x01\x20\x01(\x0cR\x10hostSt\
aticPubkey\"i\n\x15ThpCredentialResponse\x120\n\x14trezor_static_pubkey\ aticPubkey\"i\n\x15ThpCredentialResponse\x120\n\x14trezor_static_pubkey\
\x18\x01\x20\x01(\x0cR\x12trezorStaticPubkey\x12\x1e\n\ncredential\x18\ \x18\x01\x20\x01(\x0cR\x12trezorStaticPubkey\x12\x1e\n\ncredential\x18\
\x02\x20\x01(\x0cR\ncredential\"\x0c\n\nEndRequest\"\r\n\x0bEndResponse*\ \x02\x20\x01(\x0cR\ncredential\"\x0f\n\rThpEndRequest\"\x10\n\x0eThpEndR\
\x8b\x01\n\x10ThpPairingMethod\x12\x1a\n\x16PairingMethod_NoMethod\x10\ esponse*\x8b\x01\n\x10ThpPairingMethod\x12\x1a\n\x16PairingMethod_NoMeth\
\x01\x12\x1b\n\x17PairingMethod_CodeEntry\x10\x02\x12\x18\n\x14PairingMe\ od\x10\x01\x12\x1b\n\x17PairingMethod_CodeEntry\x10\x02\x12\x18\n\x14Pai\
thod_QrCode\x10\x03\x12$\n\x20PairingMethod_NFC_Unidirectional\x10\x04B7\ ringMethod_QrCode\x10\x03\x12$\n\x20PairingMethod_NFC_Unidirectional\x10\
\n#com.satoshilabs.trezor.lib.protobufB\x10TrezorMessageThp\ \x04B7\n#com.satoshilabs.trezor.lib.protobufB\x10TrezorMessageThp\
"; ";
/// `FileDescriptorProto` object which was a source for this generated file /// `FileDescriptorProto` object which was a source for this generated file
@ -3292,8 +3292,8 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor {
messages.push(ThpNfcUnideirectionalSecret::generated_message_descriptor_data()); messages.push(ThpNfcUnideirectionalSecret::generated_message_descriptor_data());
messages.push(ThpCredentialRequest::generated_message_descriptor_data()); messages.push(ThpCredentialRequest::generated_message_descriptor_data());
messages.push(ThpCredentialResponse::generated_message_descriptor_data()); messages.push(ThpCredentialResponse::generated_message_descriptor_data());
messages.push(EndRequest::generated_message_descriptor_data()); messages.push(ThpEndRequest::generated_message_descriptor_data());
messages.push(EndResponse::generated_message_descriptor_data()); messages.push(ThpEndResponse::generated_message_descriptor_data());
let mut enums = ::std::vec::Vec::with_capacity(1); let mut enums = ::std::vec::Vec::with_capacity(1);
enums.push(ThpPairingMethod::generated_enum_descriptor_data()); enums.push(ThpPairingMethod::generated_enum_descriptor_data());
::protobuf::reflect::GeneratedFileDescriptor::new_generated( ::protobuf::reflect::GeneratedFileDescriptor::new_generated(

Write Preview
Loading…
Cancel
Save