arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-28 10:52:32 +00:00
Code Issues Releases Wiki Activity

common: restore PassphraseAck.state

Browse Source
This commit is contained in:
matejcik 2020-02-20 12:10:03 +01:00
parent d7b9582386
commit b916072389
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ message PassphraseRequest {
*/ */
message PassphraseAck { message PassphraseAck {
optional string passphrase = 1; optional string passphrase = 1;
// optional bytes state = 2; DEPRECATED since 2.3.0 optional bytes _state = 2 [deprecated=true]; // <2.3.0
optional bool on_device = 3; // user wants to enter passphrase on the device optional bool on_device = 3; // user wants to enter passphrase on the device
} }

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

@ -16,14 +16,17 @@ class PassphraseAck(p.MessageType):
def __init__( def __init__(
self, self,
passphrase: str = None, passphrase: str = None,
_state: bytes = None,
on_device: bool = None, on_device: bool = None,
) -> None: ) -> None:
self.passphrase = passphrase self.passphrase = passphrase
self._state = _state
self.on_device = on_device self.on_device = on_device
@classmethod @classmethod
def get_fields(cls) -> Dict: def get_fields(cls) -> Dict:
return { return {
1: ('passphrase', p.UnicodeType, 0), 1: ('passphrase', p.UnicodeType, 0),
2: ('_state', p.BytesType, 0),
3: ('on_device', p.BoolType, 0), 3: ('on_device', p.BoolType, 0),
} }

2
docs/common/communication/passphrase-redesign-migration.md
View File

@ -43,6 +43,8 @@ The gist of the changes is:
- `PassphraseRequest.on_device` was deprecated, and renamed to `_on_device`. New Devices - `PassphraseRequest.on_device` was deprecated, and renamed to `_on_device`. New Devices
will never send this field. will never send this field.
- Corresponding field `PassphraseAck.on_device` was added. - Corresponding field `PassphraseAck.on_device` was added.
- `PassphraseAck.state` was deprecated, and renamed to `_state`. It is retained for
code compatibility, but the field should never be set.
- `PassphraseStateRequest`/`PassphraseStateAck` messages were deprecated, and renamed - `PassphraseStateRequest`/`PassphraseStateAck` messages were deprecated, and renamed
with a `Deprecated_` prefix. New Devices will not send or accept these messages. with a `Deprecated_` prefix. New Devices will not send or accept these messages.
- `Initialize.state` was renamed to `Initialize.session_id`. - `Initialize.state` was renamed to `Initialize.session_id`.

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

@ -6,6 +6,7 @@ PinMatrixAck.pin max_size:10
PassphraseAck.passphrase max_size:51 PassphraseAck.passphrase max_size:51
PassphraseAck._state max_size:1
Deprecated_PassphraseStateRequest.state max_size:1 Deprecated_PassphraseStateRequest.state max_size:1
HDNodeType.chain_code max_size:32 HDNodeType.chain_code max_size:32

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

@ -16,14 +16,17 @@ class PassphraseAck(p.MessageType):
def __init__( def __init__(
self, self,
passphrase: str = None, passphrase: str = None,
_state: bytes = None,
on_device: bool = None, on_device: bool = None,
) -> None: ) -> None:
self.passphrase = passphrase self.passphrase = passphrase
self._state = _state
self.on_device = on_device self.on_device = on_device
@classmethod @classmethod
def get_fields(cls) -> Dict: def get_fields(cls) -> Dict:
return { return {
1: ('passphrase', p.UnicodeType, 0), 1: ('passphrase', p.UnicodeType, 0),
2: ('_state', p.BytesType, 0),
3: ('on_device', p.BoolType, 0), 3: ('on_device', p.BoolType, 0),
} }