From 61e24edee0a9c9bf6599018986286de8e4e71877 Mon Sep 17 00:00:00 2001 From: djb Date: Mon, 28 May 2018 13:53:50 +0200 Subject: [PATCH 1/2] add sigs for v3 firmware --- py/load_firmware.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/py/load_firmware.py b/py/load_firmware.py index 5a37369c..292369c3 100755 --- a/py/load_firmware.py +++ b/py/load_firmware.py @@ -71,6 +71,16 @@ '45c3964e3e720c9e78388ba8555275377448b564c55a3689cc0f0312be362e25273dc7f96f491a910707185718ceb3372ada9924eba8ced8fb42ab6f7ba416c1' '5aacc1ab96f4bf67bd423c855686fd8385ac874bcc2195c8d3df36a43b3dc7ab7d5ae5d938d4b275e308642c9e1d083e9d0ceeec9915c823073a766e0fde996b' ) +elif '3.0.0' in version: + sig = ( + '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + '82bab51c67dbb4ac5ee46686cc10b485aa0868cf577c6a58e9706a156f9e0a5e0fb0032af50ae8b60a5a9e90c0814c0ab05a643ac28eb068524e1ad18683a395' + 'b12cd81632caf0e1a5dd51bd33172f11ef8fe14fa17c49c4a60146225fea629922509e23fafe53b3dcf4b8865a7b87187b557bbdb2aea3eef77ca8ec3e9b4658' + '2fb4e401896eb81e53a7d8e659c118f721e8e4fd127b3243b135054e1111ad067d088c028517cc8515d8c43c44dd8865288eb04f1756021233e42ac99462daa2' + '8f4a6af6123f33b222212eed67c21904e947c8967b72cf2a6ec77a69bebae93e5d145065fac7bd1d53929ffeb0275a5e7df1b856c02b0f58e8d2f594d2be5b3e' + ) elif 'debug' in version: sig = ( '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' @@ -120,7 +130,6 @@ def printFirmwareHash(filename): else: print('SUCCESS: valid firmware signature\n\n') - sendPlainBoot("l") # lock bootloader sendPlainBoot("b") # blink led except IOError as ex: From 2c5e09728686692e52ee1e561abf1ac34cc22fb4 Mon Sep 17 00:00:00 2001 From: djb Date: Mon, 28 May 2018 13:54:10 +0200 Subject: [PATCH 2/2] cleanup --- py/prepend_signatures_firmware_binary.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/py/prepend_signatures_firmware_binary.py b/py/prepend_signatures_firmware_binary.py index e91b7aa9..d187ef57 100755 --- a/py/prepend_signatures_firmware_binary.py +++ b/py/prepend_signatures_firmware_binary.py @@ -15,11 +15,6 @@ sig = bytearray.fromhex(signatures) - with open(padfile, 'ab') as f: - f.write(sig) - f.write(binfile) - f.close() - with file(binfile, 'r') as original: data = original.read() @@ -27,8 +22,10 @@ print '\n\nError: the binfile must be padded to 220kB' sys.exit() - with file(padfile, 'w') as modified: - modified.write(sig + data) + with file(padfile, 'w') as pf: + pf.write(sig) + pf.write(data) + pf.close() except: print '\n\nUsage:\n ./prepend_signatures_firmware_binary.py \n\n\n'