arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-28 13:09:04 +00:00
Code Issues Releases Wiki Activity

core/keyctl: get rid of serpent conversions

Browse Source
This commit is contained in:
matejcik 2019-12-20 15:00:32 +01:00 committed by Pavol Rusnak
parent b26a430b85
commit fe4ef336aa
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/tools/keyctl-coordinator
View File

@ -4,9 +4,10 @@ import struct
import click import click
import pyblake2 import pyblake2
import Pyro4 import Pyro4
import serpent
from trezorlib import cosi from trezorlib import cosi
Pyro4.config.SERIALIZER = "marshal"
PORT = 5001 PORT = 5001
indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2} indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2}
@ -50,7 +51,6 @@ def sign(index, filename, participants):
pks, Rs = [], [] pks, Rs = [], []
for i, p in enumerate(proxy): for i, p in enumerate(proxy):
pk, R = p.get_commit(index, digest) pk, R = p.get_commit(index, digest)
pk, R = serpent.tobytes(pk), serpent.tobytes(R)
pks.append(pk) pks.append(pk)
Rs.append(R) Rs.append(R)
print("collected commit #%d from %s" % (i, p._pyroUri.host)) print("collected commit #%d from %s" % (i, p._pyroUri.host))
@ -61,7 +61,6 @@ def sign(index, filename, participants):
sigs = [] sigs = []
for i, p in enumerate(proxy): for i, p in enumerate(proxy):
sig = p.get_signature(index, digest, global_R, global_pk) sig = p.get_signature(index, digest, global_R, global_pk)
sig = serpent.tobytes(sig)
sigs.append(sig) sigs.append(sig)
print("collected signature #%d from %s" % (i, p._pyroUri.host)) print("collected signature #%d from %s" % (i, p._pyroUri.host))
# compute global signature # compute global signature

9
core/tools/keyctl-proxy
View File

@ -4,9 +4,10 @@ import sys
import traceback import traceback
import Pyro4 import Pyro4
import serpent
from trezorlib import cosi, tools from trezorlib import cosi, tools
Pyro4.config.SERIALIZER = "marshal"
PORT = 5001 PORT = 5001
indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2} indexmap = {"bootloader": 0, "vendorheader": 1, "firmware": 2}
@ -26,7 +27,6 @@ def get_path(index):
@Pyro4.expose @Pyro4.expose
class KeyctlProxy(object): class KeyctlProxy(object):
def get_commit(self, index, digest): def get_commit(self, index, digest):
digest = serpent.tobytes(digest)
path = get_path(index) path = get_path(index)
commit = None commit = None
while commit is None: while commit is None:
@ -47,11 +47,6 @@ class KeyctlProxy(object):
return (pk, R) return (pk, R)
def get_signature(self, index, digest, global_R, global_pk): def get_signature(self, index, digest, global_R, global_pk):
digest, global_R, global_pk = (
serpent.tobytes(digest),
serpent.tobytes(global_R),
serpent.tobytes(global_pk),
)
path = get_path(index) path = get_path(index)
signature = None signature = None
while signature is None: while signature is None: