arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-28 19:58:45 +00:00
Code Issues Releases Wiki Activity

update pb

Browse Source
This commit is contained in:
Pavol Rusnak 2014-12-10 15:44:26 +01:00
parent 86dd83f93b
commit 6561647d6b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/protob/messages.pb.c
View File

@ -130,10 +130,11 @@ const pb_field_t PublicKey_fields[3] = {
PB_LAST_FIELD PB_LAST_FIELD
}; };
const pb_field_t GetAddress_fields[4] = { const pb_field_t GetAddress_fields[5] = {
PB_FIELD( 1, UINT32 , REPEATED, STATIC , FIRST, GetAddress, address_n, address_n, 0), PB_FIELD( 1, UINT32 , REPEATED, STATIC , FIRST, GetAddress, address_n, address_n, 0),
PB_FIELD( 2, STRING , OPTIONAL, STATIC , OTHER, GetAddress, coin_name, address_n, &GetAddress_coin_name_default), PB_FIELD( 2, STRING , OPTIONAL, STATIC , OTHER, GetAddress, coin_name, address_n, &GetAddress_coin_name_default),
PB_FIELD( 3, BOOL , OPTIONAL, STATIC , OTHER, GetAddress, show_display, coin_name, 0), PB_FIELD( 3, BOOL , OPTIONAL, STATIC , OTHER, GetAddress, show_display, coin_name, 0),
PB_FIELD( 4, MESSAGE , OPTIONAL, STATIC , OTHER, GetAddress, multisig, show_display, &MultisigRedeemScriptType_fields),
PB_LAST_FIELD PB_LAST_FIELD
}; };
@ -352,7 +353,7 @@ const pb_field_t DebugLinkLog_fields[4] = {
* numbers or field sizes that are larger than what can fit in 8 or 16 bit * numbers or field sizes that are larger than what can fit in 8 or 16 bit
* field descriptors. * field descriptors.
*/ */
PB_STATIC_ASSERT((pb_membersize(Features, coins[0]) < 65536 && pb_membersize(PublicKey, node) < 65536 && pb_membersize(LoadDevice, node) < 65536 && pb_membersize(SimpleSignTx, inputs[0]) < 65536 && pb_membersize(SimpleSignTx, outputs[0]) < 65536 && pb_membersize(SimpleSignTx, transactions[0]) < 65536 && pb_membersize(TxRequest, details) < 65536 && pb_membersize(TxRequest, serialized) < 65536 && pb_membersize(TxAck, tx) < 65536 && pb_membersize(DebugLinkState, node) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_Initialize_Features_ClearSession_ApplySettings_ChangePin_Ping_Success_Failure_ButtonRequest_ButtonAck_PinMatrixRequest_PinMatrixAck_Cancel_PassphraseRequest_PassphraseAck_GetEntropy_Entropy_GetPublicKey_PublicKey_GetAddress_Address_WipeDevice_LoadDevice_ResetDevice_EntropyRequest_EntropyAck_RecoveryDevice_WordRequest_WordAck_SignMessage_VerifyMessage_MessageSignature_EncryptMessage_EncryptedMessage_DecryptMessage_DecryptedMessage_CipherKeyValue_CipheredKeyValue_EstimateTxSize_TxSize_SignTx_SimpleSignTx_TxRequest_TxAck_FirmwareErase_FirmwareUpload_DebugLinkDecision_DebugLinkGetState_DebugLinkState_DebugLinkStop_DebugLinkLog) PB_STATIC_ASSERT((pb_membersize(Features, coins[0]) < 65536 && pb_membersize(PublicKey, node) < 65536 && pb_membersize(GetAddress, multisig) < 65536 && pb_membersize(LoadDevice, node) < 65536 && pb_membersize(SimpleSignTx, inputs[0]) < 65536 && pb_membersize(SimpleSignTx, outputs[0]) < 65536 && pb_membersize(SimpleSignTx, transactions[0]) < 65536 && pb_membersize(TxRequest, details) < 65536 && pb_membersize(TxRequest, serialized) < 65536 && pb_membersize(TxAck, tx) < 65536 && pb_membersize(DebugLinkState, node) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_Initialize_Features_ClearSession_ApplySettings_ChangePin_Ping_Success_Failure_ButtonRequest_ButtonAck_PinMatrixRequest_PinMatrixAck_Cancel_PassphraseRequest_PassphraseAck_GetEntropy_Entropy_GetPublicKey_PublicKey_GetAddress_Address_WipeDevice_LoadDevice_ResetDevice_EntropyRequest_EntropyAck_RecoveryDevice_WordRequest_WordAck_SignMessage_VerifyMessage_MessageSignature_EncryptMessage_EncryptedMessage_DecryptMessage_DecryptedMessage_CipherKeyValue_CipheredKeyValue_EstimateTxSize_TxSize_SignTx_SimpleSignTx_TxRequest_TxAck_FirmwareErase_FirmwareUpload_DebugLinkDecision_DebugLinkGetState_DebugLinkState_DebugLinkStop_DebugLinkLog)
#endif #endif
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT) #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)

11
firmware/protob/messages.pb.h
View File

@ -336,6 +336,8 @@ typedef struct _GetAddress {
char coin_name[17]; char coin_name[17];
bool has_show_display; bool has_show_display;
bool show_display; bool show_display;
bool has_multisig;
MultisigRedeemScriptType multisig;
} GetAddress; } GetAddress;
typedef struct _GetEntropy { typedef struct _GetEntropy {
@ -534,7 +536,7 @@ extern const char SimpleSignTx_coin_name_default[17];
#define Entropy_init_default {{0, {0}}} #define Entropy_init_default {{0, {0}}}
#define GetPublicKey_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}} #define GetPublicKey_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}}
#define PublicKey_init_default {HDNodeType_init_default, false, ""} #define PublicKey_init_default {HDNodeType_init_default, false, ""}
#define GetAddress_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}, false, "Bitcoin", false, 0} #define GetAddress_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}, false, "Bitcoin", false, 0, false, MultisigRedeemScriptType_init_default}
#define Address_init_default {""} #define Address_init_default {""}
#define WipeDevice_init_default {0} #define WipeDevice_init_default {0}
#define LoadDevice_init_default {false, "", false, HDNodeType_init_default, false, "", false, 0, false, "english", false, "", false, 0} #define LoadDevice_init_default {false, "", false, HDNodeType_init_default, false, "", false, 0, false, "english", false, "", false, 0}
@ -585,7 +587,7 @@ extern const char SimpleSignTx_coin_name_default[17];
#define Entropy_init_zero {{0, {0}}} #define Entropy_init_zero {{0, {0}}}
#define GetPublicKey_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}} #define GetPublicKey_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}}
#define PublicKey_init_zero {HDNodeType_init_zero, false, ""} #define PublicKey_init_zero {HDNodeType_init_zero, false, ""}
#define GetAddress_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}, false, "", false, 0} #define GetAddress_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}, false, "", false, 0, false, MultisigRedeemScriptType_init_zero}
#define Address_init_zero {""} #define Address_init_zero {""}
#define WipeDevice_init_zero {0} #define WipeDevice_init_zero {0}
#define LoadDevice_init_zero {false, "", false, HDNodeType_init_zero, false, "", false, 0, false, "", false, "", false, 0} #define LoadDevice_init_zero {false, "", false, HDNodeType_init_zero, false, "", false, 0, false, "", false, "", false, 0}
@ -686,6 +688,7 @@ extern const char SimpleSignTx_coin_name_default[17];
#define GetAddress_address_n_tag 1 #define GetAddress_address_n_tag 1
#define GetAddress_coin_name_tag 2 #define GetAddress_coin_name_tag 2
#define GetAddress_show_display_tag 3 #define GetAddress_show_display_tag 3
#define GetAddress_multisig_tag 4
#define GetEntropy_size_tag 1 #define GetEntropy_size_tag 1
#define GetPublicKey_address_n_tag 1 #define GetPublicKey_address_n_tag 1
#define LoadDevice_mnemonic_tag 1 #define LoadDevice_mnemonic_tag 1
@ -759,7 +762,7 @@ extern const pb_field_t GetEntropy_fields[2];
extern const pb_field_t Entropy_fields[2]; extern const pb_field_t Entropy_fields[2];
extern const pb_field_t GetPublicKey_fields[2]; extern const pb_field_t GetPublicKey_fields[2];
extern const pb_field_t PublicKey_fields[3]; extern const pb_field_t PublicKey_fields[3];
extern const pb_field_t GetAddress_fields[4]; extern const pb_field_t GetAddress_fields[5];
extern const pb_field_t Address_fields[2]; extern const pb_field_t Address_fields[2];
extern const pb_field_t WipeDevice_fields[1]; extern const pb_field_t WipeDevice_fields[1];
extern const pb_field_t LoadDevice_fields[8]; extern const pb_field_t LoadDevice_fields[8];
@ -812,7 +815,7 @@ extern const pb_field_t DebugLinkLog_fields[4];
#define Entropy_size 1027 #define Entropy_size 1027
#define GetPublicKey_size 48 #define GetPublicKey_size 48
#define PublicKey_size (121 + HDNodeType_size) #define PublicKey_size (121 + HDNodeType_size)
#define GetAddress_size 69 #define GetAddress_size (75 + MultisigRedeemScriptType_size)
#define Address_size 37 #define Address_size 37
#define WipeDevice_size 0 #define WipeDevice_size 0
#define LoadDevice_size (320 + HDNodeType_size) #define LoadDevice_size (320 + HDNodeType_size)

2
trezor-common

@ -1 +1 @@
Subproject commit 3670728fd205ccfc75571ec3a49bfc7d07d11b17 Subproject commit 437eff319f0673aae9f3416bd771d52dcc983e37