kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tool fixes (#537)

Browse Source 
* private key type is str, some fixes

* catches file exceptions for private key

* adds exception type

* adds exception message
This commit is contained in:
kaczmarczyck
2022-08-29 11:00:31 +02:00
committed by GitHub
parent 2dc44984ed
commit 01cc8333e5
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/configure.py
View File

@@ -169,7 +169,7 @@ def main(args):
("Failed to configure OpenSK (device is partially programmed but " ("Failed to configure OpenSK (device is partially programmed but "
"the given cert/key don't match the ones currently programmed).")) "the given cert/key don't match the ones currently programmed)."))
else: else:
error(f"Failed to configure OpenSK (unknown error: {ex}") error(f"Failed to configure OpenSK (unknown error: {ex})")
return responses return responses

32
tools/deploy_partition.py
View File

@@ -97,7 +97,7 @@ def check_info(partition_address: int, authenticator: Any):
if result[0x01] != partition_address: if result[0x01] != partition_address:
fatal("Identifiers do not match.") fatal("Identifiers do not match.")
except ctap.CtapError as ex: except ctap.CtapError as ex:
error(f"Failed to read OpenSK upgrade info (error: {ex}") fatal(f"Failed to read OpenSK upgrade info (error: {ex})")
def get_kernel(board: str) -> bytes: def get_kernel(board: str) -> bytes:
@@ -137,17 +137,21 @@ def generate_firmware_image(board: str) -> bytes:
return pad_to(kernel, KERNEL_SIZE) + pad_to(app, APP_SIZE) return pad_to(kernel, KERNEL_SIZE) + pad_to(app, APP_SIZE)
def load_priv_key(priv_key_file: argparse.FileType) -> Any: def load_priv_key(priv_key_filename: str) -> Any:
"""Loads the ECDSA private key from the specified file.""" """Loads the ECDSA private key from the specified file."""
priv_key = get_private_key(priv_key_file.read()) try:
if not isinstance(priv_key, ec.EllipticCurvePrivateKey): with open(priv_key_filename, "rb") as priv_key_file:
fatal("Private key must be an Elliptic Curve one.") priv_key = get_private_key(priv_key_file.read())
if not isinstance(priv_key.curve, ec.SECP256R1): if not isinstance(priv_key, ec.EllipticCurvePrivateKey):
fatal("Private key must use Secp256r1 curve.") fatal("Private key must be an Elliptic Curve one.")
if priv_key.key_size != 256: if not isinstance(priv_key.curve, ec.SECP256R1):
fatal("Private key must be 256 bits long.") fatal("Private key must use Secp256r1 curve.")
info("Private key is valid.") if priv_key.key_size != 256:
return priv_key fatal("Private key must be 256 bits long.")
info("Private key is valid.")
return priv_key
except IOError as e:
fatal(f"Unable to open file: {priv_key_filename}\n{e}")
def sign_firmware(data: bytes, priv_key: Any) -> bytes: def sign_firmware(data: bytes, priv_key: Any) -> bytes:
@@ -213,14 +217,14 @@ def main(args):
error(f"{message} (unsupported command).") error(f"{message} (unsupported command).")
elif ex.code.value == ctap.CtapError.ERR.INVALID_PARAMETER: elif ex.code.value == ctap.CtapError.ERR.INVALID_PARAMETER:
error(f"{message} (invalid parameter, maybe a wrong byte array size?).") error(f"{message} (invalid parameter, maybe a wrong byte array size?).")
elif ex.code.value == ctap.CtapError.ERR_INTEGRITY_FAILURE: elif ex.code.value == ctap.CtapError.ERR.INTEGRITY_FAILURE:
error(f"{message} (hashes or signature don't match).") error(f"{message} (hashes or signature don't match).")
elif ex.code.value == 0xF2: # VENDOR_INTERNAL_ERROR elif ex.code.value == 0xF2: # VENDOR_INTERNAL_ERROR
error(f"{message} (internal conditions not met).") error(f"{message} (internal conditions not met).")
elif ex.code.value == 0xF3: # VENDOR_HARDWARE_FAILURE elif ex.code.value == 0xF3: # VENDOR_HARDWARE_FAILURE
error(f"{message} (internal hardware error).") error(f"{message} (internal hardware error).")
else: else:
error(f"{message} (unexpected error: {ex}") error(f"{message} (unexpected error: {ex})")
if __name__ == "__main__": if __name__ == "__main__":
@@ -247,7 +251,7 @@ if __name__ == "__main__":
) )
parser.add_argument( parser.add_argument(
"--private-key", "--private-key",
type=argparse.FileType("rb"), type=str,
default="crypto_data/opensk_upgrade.key", default="crypto_data/opensk_upgrade.key",
dest="priv_key", dest="priv_key",
help=("PEM file for signing the firmware."), help=("PEM file for signing the firmware."),