Skip to content

Commit 457e740

Browse files
Merge pull request #560 from Foundation-Devices/dev-v2.3.4
v2.3.4
2 parents 288e73b + 11f7666 commit 457e740

File tree

4 files changed

+6
-22
lines changed

4 files changed

+6
-22
lines changed

ports/stm32/boards/Passport/modules/flows/sign_electrum_message_flow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ async def show_message(self):
8282

8383
async def do_sign(self):
8484
(sig, address, error) = await spinner_task('Signing Message', sign_text_file_task,
85-
args=[self.message, self.subpath, self.addr_format, True])
85+
args=[self.message, self.subpath, self.addr_format])
8686
if error is None:
8787
self.signature = sig
8888
self.goto(self.show_signed)

ports/stm32/boards/Passport/modules/tasks/sign_text_file_task.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,17 @@
1111

1212
import stash
1313
import chains
14-
from utils import sign_message_digest, sign_message_digest_recoverable
14+
from utils import sign_message_digest_recoverable
1515

1616

17-
async def sign_text_file_task(on_done, text, subpath, addr_fmt, recoverable=False):
17+
async def sign_text_file_task(on_done, text, subpath, addr_fmt):
1818

1919
with stash.SensitiveValues() as sv:
2020
node = sv.derive_path(subpath)
2121
address = sv.chain.address(node, addr_fmt)
2222

2323
digest = chains.current_chain().hash_message(text.encode())
24-
if recoverable:
25-
# signature will be 65 bytes
26-
signature = sign_message_digest_recoverable(digest, subpath)
27-
else:
28-
signature = sign_message_digest(digest, subpath)
24+
# signature will be 65 bytes
25+
signature = sign_message_digest_recoverable(digest, subpath)
2926

3027
await on_done(signature, address, None)

ports/stm32/boards/Passport/modules/utils.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,19 +1038,6 @@ def split_to_lines(s, width):
10381038
return '\n'.join([s[i:i + width] for i in range(0, len(s), width)])
10391039

10401040

1041-
def sign_message_digest(digest, subpath):
1042-
from foundation import secp256k1
1043-
# do the signature itself!
1044-
with stash.SensitiveValues() as sv:
1045-
node = sv.derive_path(subpath)
1046-
pk = node.private_key()
1047-
sv.register(pk)
1048-
1049-
rv = secp256k1.sign_ecdsa(digest, pk)
1050-
1051-
return rv
1052-
1053-
10541041
def sign_message_digest_recoverable(digest, subpath):
10551042
from trezorcrypto import ecdsa
10561043
# do the signature itself!

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.3
1+
2.3.4

0 commit comments

Comments
 (0)