feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/generate_keys_in_project_root' into 'master'

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

Closes IDF-10320

See merge request espressif/esp-idf!31797
This commit is contained in:
Roland Dobai
2024-07-01 18:29:22 +08:00
parent 56a84c2a7a 832c3f265a
commit 6a43ef93a1
2 changed files with 5 additions and 5 deletions
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]
if 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:
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]
if 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,
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',
'--aes-xts',
'--keyfile',
f'{self.flash_encryption_key}',
f'../{self.flash_encryption_key}',
'--address',
'0x1000',
'--output',
@ -484,7 +484,7 @@ class TestSecureCommands(TestWrapperCommands):
'secure-decrypt-flash-data',
'--aes-xts',
'--keyfile',
f'{self.flash_encryption_key}',
f'../{self.flash_encryption_key}',
'--address',
'0x1000',
'--output',
@ -515,7 +515,7 @@ class TestSecureCommands(TestWrapperCommands):
'--version',
'2',
'--keyfile',
self.signing_key,
f'../{self.signing_key}',
'--output',
'bootloader-signed.bin',
'bootloader/bootloader.bin']