From c3291c37afde96e1bcce2df5236f5ecccf9809e5 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 16 Jul 2018 15:07:42 +0200 Subject: [PATCH] vendor: update trezor-common; reflect rename of common.proto to messages-common.proto --- firmware/Makefile | 2 +- firmware/fsm.c | 2 -- firmware/protect.h | 2 +- firmware/protob/Makefile | 2 +- firmware/protob/common.options | 3 --- firmware/protob/common.proto | 1 - firmware/protob/messages-management.options | 13 ------------- vendor/trezor-common | 2 +- 8 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 firmware/protob/common.options delete mode 120000 firmware/protob/common.proto diff --git a/firmware/Makefile b/firmware/Makefile index 0f823bd23..39c8e1bb7 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -82,9 +82,9 @@ OBJS += ../vendor/nanopb/pb_common.o OBJS += ../vendor/nanopb/pb_decode.o OBJS += ../vendor/nanopb/pb_encode.o -OBJS += protob/common.pb.o OBJS += protob/messages.pb.o OBJS += protob/messages-bitcoin.pb.o +OBJS += protob/messages-common.pb.o OBJS += protob/messages-crypto.pb.o OBJS += protob/messages-debug.pb.o OBJS += protob/messages-ethereum.pb.o diff --git a/firmware/fsm.c b/firmware/fsm.c index 5e2dcdf57..e1cff17b0 100644 --- a/firmware/fsm.c +++ b/firmware/fsm.c @@ -58,8 +58,6 @@ #include "supervise.h" #include "stellar.h" -#include "messages-management.pb.h" - // message methods static uint8_t msg_resp[MSG_OUT_SIZE] __attribute__ ((aligned)); diff --git a/firmware/protect.h b/firmware/protect.h index d8c9cde64..db5edb022 100644 --- a/firmware/protect.h +++ b/firmware/protect.h @@ -21,7 +21,7 @@ #define __PROTECT_H__ #include -#include "messages-management.pb.h" +#include "messages-common.pb.h" bool protectButton(ButtonRequest_ButtonRequestType type, bool confirm_only); bool protectPin(bool use_cached); diff --git a/firmware/protob/Makefile b/firmware/protob/Makefile index e0b9e10eb..7873b4c97 100644 --- a/firmware/protob/Makefile +++ b/firmware/protob/Makefile @@ -2,7 +2,7 @@ ifneq ($(V),1) Q := @ endif -all: messages_map.h common.pb.c messages-bitcoin.pb.c messages-crypto.pb.c messages-debug.pb.c messages-ethereum.pb.c messages-management.pb.c messages-nem.pb.c messages.pb.c messages-stellar.pb.c messages_nem_pb2.py +all: messages_map.h messages-bitcoin.pb.c messages-common.pb.c messages-crypto.pb.c messages-debug.pb.c messages-ethereum.pb.c messages-management.pb.c messages-nem.pb.c messages.pb.c messages-stellar.pb.c messages_nem_pb2.py PYTHON ?= python diff --git a/firmware/protob/common.options b/firmware/protob/common.options deleted file mode 100644 index 875029177..000000000 --- a/firmware/protob/common.options +++ /dev/null @@ -1,3 +0,0 @@ -HDNodeType.chain_code max_size:32 -HDNodeType.private_key max_size:32 -HDNodeType.public_key max_size:33 diff --git a/firmware/protob/common.proto b/firmware/protob/common.proto deleted file mode 120000 index 1bc14a738..000000000 --- a/firmware/protob/common.proto +++ /dev/null @@ -1 +0,0 @@ -../../vendor/trezor-common/protob/common.proto \ No newline at end of file diff --git a/firmware/protob/messages-management.options b/firmware/protob/messages-management.options index 039b1b6d5..b3ee14605 100644 --- a/firmware/protob/messages-management.options +++ b/firmware/protob/messages-management.options @@ -16,19 +16,6 @@ ApplySettings.homescreen max_size:1024 Ping.message max_size:256 -Success.message max_size:256 - -Failure.message max_size:256 - -ButtonRequest.data max_size:256 - -PinMatrixAck.pin max_size:10 - -PassphraseAck.passphrase max_size:51 -PassphraseAck.state max_size:64 - -PassphraseStateRequest.state max_size:64 - LoadDevice.mnemonic max_size:241 LoadDevice.pin max_size:10 LoadDevice.language max_size:17 diff --git a/vendor/trezor-common b/vendor/trezor-common index 32850a626..e0108d34b 160000 --- a/vendor/trezor-common +++ b/vendor/trezor-common @@ -1 +1 @@ -Subproject commit 32850a62624ce1a6612ff545beb706560c3716da +Subproject commit e0108d34bf4b741d9ddcf1e7b423e799a3a04b77