alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: Generate secure keys in project dir instead of build dir

Browse Source
This commit is contained in:
Jan Beran 2024-06-28 10:06:38 +02:00
parent be05548666
commit 832c3f265a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/idf_py_actions/serial_ext.py
View File

@ -387,7 +387,7 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
generate_flash_encryption_key_args += ['--keylen', keylen] generate_flash_encryption_key_args += ['--keylen', keylen]
if extra_args['keyfile']: if extra_args['keyfile']:
generate_flash_encryption_key_args += [extra_args['keyfile']] generate_flash_encryption_key_args += [extra_args['keyfile']]
RunTool('espsecure', generate_flash_encryption_key_args, args.build_dir)() RunTool('espsecure', generate_flash_encryption_key_args, args.project_dir)()
def secure_generate_signing_key(action: str, ctx: click.core.Context, args: PropertyDict, version: str, scheme: str, **extra_args: str) -> None: def secure_generate_signing_key(action: str, ctx: click.core.Context, args: PropertyDict, version: str, scheme: str, **extra_args: str) -> None:
ensure_build_directory(args, ctx.info_name) ensure_build_directory(args, ctx.info_name)
@ -406,7 +406,7 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
generate_signing_key_args += ['--scheme', scheme] generate_signing_key_args += ['--scheme', scheme]
if extra_args['keyfile']: if extra_args['keyfile']:
generate_signing_key_args += [extra_args['keyfile']] generate_signing_key_args += [extra_args['keyfile']]
RunTool('espsecure', generate_signing_key_args, args.build_dir)() RunTool('espsecure', generate_signing_key_args, args.project_dir)()
def secure_sign_data(action: str, def secure_sign_data(action: str,
ctx: click.core.Context, ctx: click.core.Context,

6
tools/test_idf_py/test_idf_py.py
View File

@ -467,7 +467,7 @@ class TestSecureCommands(TestWrapperCommands):
'secure-encrypt-flash-data', 'secure-encrypt-flash-data',
'--aes-xts', '--aes-xts',
'--keyfile', '--keyfile',
f'{self.flash_encryption_key}', f'../{self.flash_encryption_key}',
'--address', '--address',
'0x1000', '0x1000',
'--output', '--output',
@ -484,7 +484,7 @@ class TestSecureCommands(TestWrapperCommands):
'secure-decrypt-flash-data', 'secure-decrypt-flash-data',
'--aes-xts', '--aes-xts',
'--keyfile', '--keyfile',
f'{self.flash_encryption_key}', f'../{self.flash_encryption_key}',
'--address', '--address',
'0x1000', '0x1000',
'--output', '--output',
@ -515,7 +515,7 @@ class TestSecureCommands(TestWrapperCommands):
'--version', '--version',
'2', '2',
'--keyfile', '--keyfile',
self.signing_key, f'../{self.signing_key}',
'--output', '--output',
'bootloader-signed.bin', 'bootloader-signed.bin',
'bootloader/bootloader.bin'] 'bootloader/bootloader.bin']