arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-29 10:58:21 +00:00
Code Issues Releases Wiki Activity

tools: fix keyctl-proxy

Browse Source
This commit is contained in:
Pavol Rusnak 2019-02-21 16:18:49 +01:00
parent 5ecd77681f
commit 5560a35af7
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/keyctl-proxy
View File

@ -1,8 +1,11 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import binascii import binascii
import sys import sys
import traceback
import Pyro4 import Pyro4
import serpent import serpent
from trezorlib import cosi, tools
PORT = 5001 PORT = 5001
indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2} indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2}
@ -11,8 +14,9 @@ indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2}
def get_trezor(): def get_trezor():
from trezorlib.client import TrezorClient from trezorlib.client import TrezorClient
from trezorlib.transport import get_transport from trezorlib.transport import get_transport
from trezorlib.ui import ClickUI
return TrezorClient(get_transport()) return TrezorClient(get_transport(), ui=ClickUI())
def get_path(index): def get_path(index):
@ -32,9 +36,10 @@ class KeyctlProxy(object):
"\n\n\nCommiting to hash %s with path %s:" "\n\n\nCommiting to hash %s with path %s:"
% (binascii.hexlify(digest).decode(), path) % (binascii.hexlify(digest).decode(), path)
) )
commit = t.cosi_commit(t.expand_path(path), digest) commit = cosi.commit(t, tools.parse_path(path), digest)
except Exception as e: except Exception as e:
print(e) print(e)
traceback.print_exc()
print("Trying again ...") print("Trying again ...")
pk = commit.pubkey pk = commit.pubkey
R = commit.commitment R = commit.commitment
@ -56,11 +61,12 @@ class KeyctlProxy(object):
"\n\n\nSigning hash %s with path %s:" "\n\n\nSigning hash %s with path %s:"
% (binascii.hexlify(digest).decode(), path) % (binascii.hexlify(digest).decode(), path)
) )
signature = t.cosi_sign( signature = cosi.sign(
t.expand_path(path), digest, global_R, global_pk t, tools.parse_path(path), digest, global_R, global_pk
) )
except Exception as e: except Exception as e:
print(e) print(e)
traceback.print_exc()
print("Trying again ...") print("Trying again ...")
sig = signature.signature sig = signature.signature
print("Signature sent!") print("Signature sent!")