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

common/protob: remove ButtonRequest.data field

Browse Source
This commit is contained in:
Pavol Rusnak 2019-10-23 15:18:47 +00:00
parent 9a3d8ef2c4
commit 5fe2f7e59c
8 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/protob/messages-common.proto
View File

@ -44,7 +44,6 @@ message Failure {
*/ */
message ButtonRequest { message ButtonRequest {
optional ButtonRequestType code = 1; optional ButtonRequestType code = 1;
optional string data = 2;
/** /**
* Type of button request * Type of button request
*/ */

2
core/embed/bootloader/protob/messages.options
View File

@ -14,6 +14,4 @@ Success.message max_size:256
Failure.message max_size:256 Failure.message max_size:256
ButtonRequest.data max_size:256
FirmwareUpload.hash max_size:32 FirmwareUpload.hash max_size:32

7
core/embed/bootloader/protob/messages.pb.c
View File

@ -1,5 +1,5 @@
/* Automatically generated nanopb constant definitions */ /* Automatically generated nanopb constant definitions */
/* Generated by nanopb-0.4.0-dev */ /* Generated by nanopb-0.3.9.4 */
#include "messages.pb.h" #include "messages.pb.h"
@ -58,9 +58,8 @@ const pb_field_t Failure_fields[3] = {
PB_LAST_FIELD PB_LAST_FIELD
}; };
const pb_field_t ButtonRequest_fields[3] = { const pb_field_t ButtonRequest_fields[2] = {
PB_FIELD( 1, ENUM , OPTIONAL, STATIC , FIRST, ButtonRequest, code, code, 0), PB_FIELD( 1, ENUM , OPTIONAL, STATIC , FIRST, ButtonRequest, code, code, 0),
PB_FIELD( 2, STRING , OPTIONAL, STATIC , OTHER, ButtonRequest, data, code, 0),
PB_LAST_FIELD PB_LAST_FIELD
}; };
@ -89,7 +88,7 @@ const pb_field_t FirmwareUpload_fields[3] = {
/* Check that field information fits in pb_field_t */ /* Check that field information fits in pb_field_t */
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
#error Field descriptor for ButtonRequest.data is too large. Define PB_FIELD_16BIT to fix this. #error Field descriptor for Failure.message is too large. Define PB_FIELD_16BIT to fix this.
#endif #endif

17
core/embed/bootloader/protob/messages.pb.h
View File

@ -1,5 +1,5 @@
/* Automatically generated nanopb header */ /* Automatically generated nanopb header */
/* Generated by nanopb-0.4.0-dev */ /* Generated by nanopb-0.3.9.4 */
#ifndef PB_MESSAGES_PB_H_INCLUDED #ifndef PB_MESSAGES_PB_H_INCLUDED
#define PB_MESSAGES_PB_H_INCLUDED #define PB_MESSAGES_PB_H_INCLUDED
@ -53,8 +53,6 @@ typedef struct _Initialize {
typedef struct _ButtonRequest { typedef struct _ButtonRequest {
bool has_code; bool has_code;
ButtonRequestType code; ButtonRequestType code;
bool has_data;
char data[256];
/* @@protoc_insertion_point(struct:ButtonRequest) */ /* @@protoc_insertion_point(struct:ButtonRequest) */
} ButtonRequest; } ButtonRequest;
@ -154,8 +152,8 @@ typedef struct _Success {
#define Features_init_default {false, "", false, 0, false, 0, false, 0, false, 0, false, "", false, "", false, "", false, 0, false, {0, {0}}, false, 0, false, "", false, 0, false, 0, false, 0, false, "", false, {0, {0}}} #define Features_init_default {false, "", false, 0, false, 0, false, 0, false, 0, false, "", false, "", false, "", false, 0, false, {0, {0}}, false, 0, false, "", false, 0, false, 0, false, 0, false, "", false, {0, {0}}}
#define Ping_init_default {false, "", false, 0, false, 0, false, 0} #define Ping_init_default {false, "", false, 0, false, 0, false, 0}
#define Success_init_default {false, ""} #define Success_init_default {false, ""}
#define Failure_init_default {false, (FailureType)0, false, ""} #define Failure_init_default {false, _FailureType_MIN, false, ""}
#define ButtonRequest_init_default {false, (ButtonRequestType)0, false, ""} #define ButtonRequest_init_default {false, _ButtonRequestType_MIN}
#define ButtonAck_init_default {0} #define ButtonAck_init_default {0}
#define FirmwareErase_init_default {false, 0} #define FirmwareErase_init_default {false, 0}
#define FirmwareRequest_init_default {false, 0, false, 0} #define FirmwareRequest_init_default {false, 0, false, 0}
@ -165,8 +163,8 @@ typedef struct _Success {
#define Features_init_zero {false, "", false, 0, false, 0, false, 0, false, 0, false, "", false, "", false, "", false, 0, false, {0, {0}}, false, 0, false, "", false, 0, false, 0, false, 0, false, "", false, {0, {0}}} #define Features_init_zero {false, "", false, 0, false, 0, false, 0, false, 0, false, "", false, "", false, "", false, 0, false, {0, {0}}, false, 0, false, "", false, 0, false, 0, false, 0, false, "", false, {0, {0}}}
#define Ping_init_zero {false, "", false, 0, false, 0, false, 0} #define Ping_init_zero {false, "", false, 0, false, 0, false, 0}
#define Success_init_zero {false, ""} #define Success_init_zero {false, ""}
#define Failure_init_zero {false, (FailureType)0, false, ""} #define Failure_init_zero {false, _FailureType_MIN, false, ""}
#define ButtonRequest_init_zero {false, (ButtonRequestType)0, false, ""} #define ButtonRequest_init_zero {false, _ButtonRequestType_MIN}
#define ButtonAck_init_zero {0} #define ButtonAck_init_zero {0}
#define FirmwareErase_init_zero {false, 0} #define FirmwareErase_init_zero {false, 0}
#define FirmwareRequest_init_zero {false, 0, false, 0} #define FirmwareRequest_init_zero {false, 0, false, 0}
@ -174,7 +172,6 @@ typedef struct _Success {
/* Field tags (for use in manual encoding/decoding) */ /* Field tags (for use in manual encoding/decoding) */
#define ButtonRequest_code_tag 1 #define ButtonRequest_code_tag 1
#define ButtonRequest_data_tag 2
#define Failure_code_tag 1 #define Failure_code_tag 1
#define Failure_message_tag 2 #define Failure_message_tag 2
#define Features_vendor_tag 1 #define Features_vendor_tag 1
@ -212,7 +209,7 @@ extern const pb_field_t Features_fields[18];
extern const pb_field_t Ping_fields[5]; extern const pb_field_t Ping_fields[5];
extern const pb_field_t Success_fields[2]; extern const pb_field_t Success_fields[2];
extern const pb_field_t Failure_fields[3]; extern const pb_field_t Failure_fields[3];
extern const pb_field_t ButtonRequest_fields[3]; extern const pb_field_t ButtonRequest_fields[2];
extern const pb_field_t ButtonAck_fields[1]; extern const pb_field_t ButtonAck_fields[1];
extern const pb_field_t FirmwareErase_fields[2]; extern const pb_field_t FirmwareErase_fields[2];
extern const pb_field_t FirmwareRequest_fields[3]; extern const pb_field_t FirmwareRequest_fields[3];
@ -225,7 +222,7 @@ extern const pb_field_t FirmwareUpload_fields[3];
#define Ping_size 265 #define Ping_size 265
#define Success_size 259 #define Success_size 259
#define Failure_size 270 #define Failure_size 270
#define ButtonRequest_size 270 #define ButtonRequest_size 11
#define ButtonAck_size 0 #define ButtonAck_size 0
#define FirmwareErase_size 6 #define FirmwareErase_size 6
#define FirmwareRequest_size 12 #define FirmwareRequest_size 12

1
core/embed/bootloader/protob/messages.proto
View File

@ -97,7 +97,6 @@ message Failure {
*/ */
message ButtonRequest { message ButtonRequest {
optional ButtonRequestType code = 1; optional ButtonRequestType code = 1;
optional string data = 2;
} }
/** /**

3
core/src/trezor/messages/ButtonRequest.py
View File

@ -17,14 +17,11 @@ class ButtonRequest(p.MessageType):
def __init__( def __init__(
self, self,
code: EnumTypeButtonRequestType = None, code: EnumTypeButtonRequestType = None,
data: str = None,
) -> None: ) -> None:
self.code = code self.code = code
self.data = data
@classmethod @classmethod
def get_fields(cls) -> Dict: def get_fields(cls) -> Dict:
return { return {
1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)), 0), 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)), 0),
2: ('data', p.UnicodeType, 0),
} }

2
legacy/firmware/protob/messages-common.options
View File

@ -2,8 +2,6 @@ Success.message max_size:256
Failure.message max_size:256 Failure.message max_size:256
ButtonRequest.data max_size:256
PinMatrixAck.pin max_size:10 PinMatrixAck.pin max_size:10
PassphraseAck.passphrase max_size:51 PassphraseAck.passphrase max_size:51

3
python/src/trezorlib/messages/ButtonRequest.py
View File

@ -17,14 +17,11 @@ class ButtonRequest(p.MessageType):
def __init__( def __init__(
self, self,
code: EnumTypeButtonRequestType = None, code: EnumTypeButtonRequestType = None,
data: str = None,
) -> None: ) -> None:
self.code = code self.code = code
self.data = data
@classmethod @classmethod
def get_fields(cls) -> Dict: def get_fields(cls) -> Dict:
return { return {
1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)), 0), 1: ('code', p.EnumType("ButtonRequestType", (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)), 0),
2: ('data', p.UnicodeType, 0),
} }