arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-10 23:40:58 +00:00
Code Issues Releases Wiki Activity

tools: refactor index in keyctl

Browse Source
This commit is contained in:
Pavol Rusnak 2018-01-29 09:10:19 +01:00
parent bfa79cbfd3
commit 5ede6864d5
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/keyctl
View File

@ -27,13 +27,19 @@ def get_trezor():
def header_to_sign(index, data): def header_to_sign(index, data):
z = bytes(65 * [0x00]) z = bytes(65 * [0x00])
if index == 0: # bootloader if index == 'bootloader':
return data[:0x03BF] + z return data[:0x03BF] + z
elif index == 1: # vendorheader elif index == 'vendorheader':
return data[:-65] + z return data[:-65] + z
elif index == 2: # firmware elif index == 'firmware':
vhdrlen = struct.unpack('<I', data[4:8])[0] vhdrlen = struct.unpack('<I', data[4:8])[0]
return data[vhdrlen:vhdrlen + 0x03BF] + z return data[vhdrlen:vhdrlen + 0x03BF] + z
else:
raise ValueError('Unknown index "%s"' % index)
def get_path(index):
return "10018'/%d'" % indexmap[index]
@click.group() @click.group()
@ -44,9 +50,8 @@ def cli():
@cli.command(help='') @cli.command(help='')
@click.argument('index', type=click.Choice(indexmap.keys())) @click.argument('index', type=click.Choice(indexmap.keys()))
def getkey(index): def getkey(index):
index = indexmap[index]
t = get_trezor() t = get_trezor()
path = "10018'/%d'" % index path = get_path(index)
node = t.get_public_node(t.expand_path(path), ecdsa_curve_name='ed25519').node node = t.get_public_node(t.expand_path(path), ecdsa_curve_name='ed25519').node
print('%s' % (binascii.hexlify(node.public_key[1:]).decode())) print('%s' % (binascii.hexlify(node.public_key[1:]).decode()))
@ -56,7 +61,6 @@ def getkey(index):
@click.argument('filename') @click.argument('filename')
@click.argument('seckey', required=False) @click.argument('seckey', required=False)
def commit(index, filename, seckey): def commit(index, filename, seckey):
index = indexmap[index]
data = open(filename, 'rb').read() data = open(filename, 'rb').read()
data = header_to_sign(index, data) data = header_to_sign(index, data)
digest = pyblake2.blake2s(data).digest() digest = pyblake2.blake2s(data).digest()
@ -67,7 +71,7 @@ def commit(index, filename, seckey):
_, R = ed25519cosi.get_nonce(sk, digest, ctr) _, R = ed25519cosi.get_nonce(sk, digest, ctr)
else: else:
t = get_trezor() t = get_trezor()
path = "10018'/%d'" % index path = get_path(index)
print('commiting to hash %s with path %s' % (binascii.hexlify(digest).decode(), path)) print('commiting to hash %s with path %s' % (binascii.hexlify(digest).decode(), path))
commit = t.cosi_commit(t.expand_path(path), digest) commit = t.cosi_commit(t.expand_path(path), digest)
pk = commit.pubkey pk = commit.pubkey
@ -96,7 +100,6 @@ def global_commit(commits):
@click.argument('global_commit') @click.argument('global_commit')
@click.argument('seckey', required=False) @click.argument('seckey', required=False)
def sign(index, filename, global_commit, seckey): def sign(index, filename, global_commit, seckey):
index = indexmap[index]
data = open(filename, 'rb').read() data = open(filename, 'rb').read()
data = header_to_sign(index, data) data = header_to_sign(index, data)
digest = pyblake2.blake2s(data).digest() digest = pyblake2.blake2s(data).digest()
@ -112,7 +115,7 @@ def sign(index, filename, global_commit, seckey):
sig = ed25519raw.encodeint(S) sig = ed25519raw.encodeint(S)
else: else:
t = get_trezor() t = get_trezor()
path = "10018'/%d'" % index path = get_path(index)
print('signing hash %s with path %s' % (binascii.hexlify(digest).decode(), path)) print('signing hash %s with path %s' % (binascii.hexlify(digest).decode(), path))
signature = t.cosi_sign(t.expand_path(path), digest, global_R, global_pk) signature = t.cosi_sign(t.expand_path(path), digest, global_R, global_pk)
sig = signature.signature sig = signature.signature
@ -125,7 +128,6 @@ def sign(index, filename, global_commit, seckey):
@click.argument('global_commit') @click.argument('global_commit')
@click.argument('signatures', nargs=-1) @click.argument('signatures', nargs=-1)
def global_sign(index, filename, global_commit, signatures): def global_sign(index, filename, global_commit, signatures):
index = indexmap[index]
data = open(filename, 'rb').read() data = open(filename, 'rb').read()
data = header_to_sign(index, data) data = header_to_sign(index, data)
digest = pyblake2.blake2s(data).digest() digest = pyblake2.blake2s(data).digest()