arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-15 20:48:45 +00:00
Code Issues Releases Wiki Activity

legacy: fix CALLBACK checker

Browse Source
This commit is contained in:
matejcik 2020-02-12 17:18:30 +01:00
parent 1cc1382153
commit 0ec628ccd4
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/firmware/protob/Makefile
View File

@ -9,11 +9,11 @@ ifeq ($(BITCOIN_ONLY), 1)
SKIPPED_MESSAGES += Ethereum Lisk NEM Stellar SKIPPED_MESSAGES += Ethereum Lisk NEM Stellar
endif endif
all: messages_map.h messages_map_limits.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-lisk.pb.c messages_nem_pb2.py all: messages_map.h messages_map_limits.h messages-bitcoin.pb.h messages-common.pb.h messages-crypto.pb.h messages-debug.pb.h messages-ethereum.pb.h messages-management.pb.h messages-nem.pb.h messages.pb.h messages-stellar.pb.h messages-lisk.pb.h messages_nem_pb2.py
PYTHON ?= python PYTHON ?= python
%.pb.c: %.pb %.options %.pb.h: %.pb %.options
@printf " NANOPB $@\n" @printf " NANOPB $@\n"
$(Q)nanopb_generator $< \ $(Q)nanopb_generator $< \
-L '#include "%s"' \ -L '#include "%s"' \

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

@ -5,6 +5,9 @@ Failure.message max_size:256
PinMatrixAck.pin max_size:10 PinMatrixAck.pin max_size:10
PassphraseAck.passphrase max_size:51 PassphraseAck.passphrase max_size:51
PassphraseAck._state max_size:32
Deprecated_PassphraseStateRequest.state max_size:1
HDNodeType.chain_code max_size:32 HDNodeType.chain_code max_size:32
HDNodeType.private_key max_size:32 HDNodeType.private_key max_size:32

6
legacy/firmware/protob/messages-debug.options
View File

@ -17,3 +17,9 @@ DebugLinkMemoryWrite.memory max_size:1024
# unused fields # unused fields
DebugLinkState.layout_lines max_count:10 max_size:30 DebugLinkState.layout_lines max_count:10 max_size:30
DebugLinkLayout.lines max_count:10 max_size:30 DebugLinkLayout.lines max_count:10 max_size:30
DebugLinkRecordScreen.target_directory max_size:1
DebugLinkShowText.header_text max_size:1
DebugLinkShowText.body_text max_count:1
DebugLinkShowText.header_icon max_size:1
DebugLinkShowText.icon_color max_size:1
DebugLinkShowTextItem.content max_size:1

2
legacy/script/cibuild
View File

@ -20,7 +20,7 @@ if [ "$EMULATOR" != 1 ]; then
fi fi
# invoking nanopb_generator to make sure its proto files are generated # invoking nanopb_generator to make sure its proto files are generated
nanopb_generator 2>/dev/null || true nanopb_generator >/dev/null || true
make -C firmware/protob make -C firmware/protob
make -C firmware make -C firmware

6
python/src/trezorlib/client.py
View File

@ -187,12 +187,8 @@ class TrezorClient:
available_on_device = Capability.PassphraseEntry in self.features.capabilities available_on_device = Capability.PassphraseEntry in self.features.capabilities
def send_passphrase(passphrase=None, on_device=None): def send_passphrase(passphrase=None, on_device=None):
if self.features.model == "1":
state = None
else:
state = self.session_id
msg = messages.PassphraseAck( msg = messages.PassphraseAck(
_state=state, passphrase=passphrase, on_device=on_device _state=self.session_id, passphrase=passphrase, on_device=on_device
) )
resp = self.call_raw(msg) resp = self.call_raw(msg)
if isinstance(resp, messages.Deprecated_PassphraseStateRequest): if isinstance(resp, messages.Deprecated_PassphraseStateRequest):