Merge branch 'master' of https://github.com/LedgerHQ/blue-loader-python
This commit is contained in:
commit
53a76b055e
|
@ -21,12 +21,15 @@ from .comm import getDongle
|
|||
import binascii
|
||||
import argparse
|
||||
|
||||
|
||||
def auto_int(x):
|
||||
return int(x, 0)
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--key", help="Reference of the endorsement key to setup (1 or 2)", type=auto_int)
|
||||
parser.add_argument("--certificate", help="Certificate to store if finalizing the endorsement (hex encoded)")
|
||||
parser.add_argument(
|
||||
"--key", help="Reference of the endorsement key to setup (1 or 2)", type=auto_int)
|
||||
parser.add_argument(
|
||||
"--certificate", help="Certificate to store if finalizing the endorsement (hex encoded)")
|
||||
parser.add_argument("--apdu", help="Display APDU log", action='store_true')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
@ -40,10 +43,10 @@ dongle = getDongle(args.apdu)
|
|||
if args.certificate == None:
|
||||
apdu = bytearray([0xe0, 0xC0, args.key, 0x00, 0x00])
|
||||
response = dongle.exchange(apdu)
|
||||
print "Public key " + str(response[0:65]).encode('hex')
|
||||
print "Certificate " + str(response[65:]).encode('hex')
|
||||
print("Public key " + str(response[0:65]).encode('hex'))
|
||||
print("Certificate " + str(response[65:]).encode('hex'))
|
||||
else:
|
||||
certificate = bytearray.fromhex(args.certificate)
|
||||
apdu = bytearray([0xe0, 0xC2, 0x00, 0x00, len(certificate)]) + certificate
|
||||
dongle.exchange(apdu)
|
||||
print "Endorsement setup finalized"
|
||||
print("Endorsement setup finalized")
|
||||
|
|
|
@ -44,4 +44,4 @@ for a in parser.getAreas():
|
|||
m.update(a.data)
|
||||
dataToSign = m.digest()
|
||||
|
||||
print dataToSign.encode('hex')
|
||||
print(dataToSign.encode('hex'))
|
||||
|
|
|
@ -25,13 +25,15 @@ import argparse
|
|||
import sys
|
||||
import fileinput
|
||||
|
||||
|
||||
def auto_int(x):
|
||||
return int(x, 0)
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--fileName", help="Set the file name to load")
|
||||
parser.add_argument("--apdu", help="Display APDU log", action='store_true')
|
||||
parser.add_argument("--scp", help="open secure channel to exchange apdu", action='store_true')
|
||||
parser.add_argument(
|
||||
"--scp", help="open secure channel to exchange apdu", action='store_true')
|
||||
parser.add_argument("--targetId", help="Set the chip target ID", type=auto_int)
|
||||
parser.add_argument("--rootPrivateKey", help="Set the root private key")
|
||||
|
||||
|
@ -47,6 +49,7 @@ else:
|
|||
|
||||
|
||||
class SCP:
|
||||
|
||||
def __init__(self, dongle, targetId, rootPrivateKey):
|
||||
self.key = getDeployedSecretV2(dongle, rootPrivateKey, targetId)
|
||||
self.iv = b'\x00' * 16
|
||||
|
@ -76,7 +79,8 @@ dongle = getDongle(args.apdu)
|
|||
if args.scp:
|
||||
if args.rootPrivateKey is None:
|
||||
privateKey = PrivateKey()
|
||||
publicKey = binascii.hexlify(privateKey.pubkey.serialize(compressed=False))
|
||||
publicKey = binascii.hexlify(
|
||||
privateKey.pubkey.serialize(compressed=False))
|
||||
print("Generated random root public key : %s" % publicKey)
|
||||
args.rootPrivateKey = privateKey.serialize()
|
||||
scp = SCP(dongle, args.targetId, bytearray.fromhex(args.rootPrivateKey))
|
||||
|
@ -90,7 +94,8 @@ for data in file:
|
|||
if data[4] > 0 and len(data) > 5:
|
||||
apduData = data[5: 5 + data[4]]
|
||||
apduData = scp.encryptAES(str(apduData))
|
||||
result = dongle.exchange(data[0:4] + bytearray([len(apduData)]) + bytearray(apduData))
|
||||
result = dongle.exchange(
|
||||
data[0:4] + bytearray([len(apduData)]) + bytearray(apduData))
|
||||
else:
|
||||
result = dongle.exchange(data[0:5])
|
||||
result = scp.decryptAES(str(result))
|
||||
|
|
Loading…
Reference in New Issue