From b2877afa7fb43bc72cb1606aac43ed425e5fc2a5 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Tue, 2 Mar 2021 10:57:00 +0200 Subject: [PATCH] feat(common): add public_key to ECDHSessionKey --- common/protob/messages-crypto.proto | 1 + core/src/trezor/messages/ECDHSessionKey.py | 3 +++ python/src/trezorlib/messages/ECDHSessionKey.py | 3 +++ 3 files changed, 7 insertions(+) diff --git a/common/protob/messages-crypto.proto b/common/protob/messages-crypto.proto index 55a0df479..bb8569807 100644 --- a/common/protob/messages-crypto.proto +++ b/common/protob/messages-crypto.proto @@ -83,6 +83,7 @@ message GetECDHSessionKey { */ message ECDHSessionKey { required bytes session_key = 1; // ECDH session key + optional bytes public_key = 2; // identity public key } /** diff --git a/core/src/trezor/messages/ECDHSessionKey.py b/core/src/trezor/messages/ECDHSessionKey.py index bb86939c1..03d1a4ffa 100644 --- a/core/src/trezor/messages/ECDHSessionKey.py +++ b/core/src/trezor/messages/ECDHSessionKey.py @@ -17,11 +17,14 @@ class ECDHSessionKey(p.MessageType): self, *, session_key: bytes, + public_key: bytes = None, ) -> None: self.session_key = session_key + self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { 1: ('session_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('public_key', p.BytesType, None), } diff --git a/python/src/trezorlib/messages/ECDHSessionKey.py b/python/src/trezorlib/messages/ECDHSessionKey.py index b7bca33b6..84ee339f5 100644 --- a/python/src/trezorlib/messages/ECDHSessionKey.py +++ b/python/src/trezorlib/messages/ECDHSessionKey.py @@ -17,11 +17,14 @@ class ECDHSessionKey(p.MessageType): self, *, session_key: bytes, + public_key: bytes = None, ) -> None: self.session_key = session_key + self.public_key = public_key @classmethod def get_fields(cls) -> Dict: return { 1: ('session_key', p.BytesType, p.FLAG_REQUIRED), + 2: ('public_key', p.BytesType, None), }