forked from espressif/esp-idf
Merge branch 'fix/mfg_gen_encrypted_keys_prefix' into 'master'
feat(mfg_gen): provision for specifying prefix counter for encrypted key files See merge request espressif/esp-idf!35124
This commit is contained in:
@@ -283,10 +283,14 @@ def create_intermediate_csv(args, keys_in_values_file, keys_repeat, is_encr=Fals
|
|||||||
prefix_number = f'{prefix_num_start:0{prefix_num_digits}}'
|
prefix_number = f'{prefix_num_start:0{prefix_num_digits}}'
|
||||||
csv_filename = args.prefix + '-' + prefix_number + '-' + file_identifier_value + '.' + 'csv'
|
csv_filename = args.prefix + '-' + prefix_number + '-' + file_identifier_value + '.' + 'csv'
|
||||||
bin_filename = args.prefix + '-' + prefix_number + '-' + file_identifier_value + '.' + 'bin'
|
bin_filename = args.prefix + '-' + prefix_number + '-' + file_identifier_value + '.' + 'bin'
|
||||||
|
if args.keygen:
|
||||||
|
args.keyfile = 'keys-' + args.prefix + '-' + prefix_number + '-' + file_identifier_value
|
||||||
prefix_num_start += 1
|
prefix_num_start += 1
|
||||||
else:
|
else:
|
||||||
csv_filename = args.prefix + '-' + file_identifier_value + '.' + 'csv'
|
csv_filename = args.prefix + '-' + file_identifier_value + '.' + 'csv'
|
||||||
bin_filename = args.prefix + '-' + file_identifier_value + '.' + 'bin'
|
bin_filename = args.prefix + '-' + file_identifier_value + '.' + 'bin'
|
||||||
|
if args.keygen:
|
||||||
|
args.keyfile = 'keys-' + args.prefix + '-' + file_identifier_value
|
||||||
|
|
||||||
output_csv_file = output_csv_target_dir + csv_filename
|
output_csv_file = output_csv_target_dir + csv_filename
|
||||||
# Verify if output csv file does not exist
|
# Verify if output csv file does not exist
|
||||||
@@ -304,8 +308,6 @@ def create_intermediate_csv(args, keys_in_values_file, keys_repeat, is_encr=Fals
|
|||||||
|
|
||||||
args.input = output_csv_file
|
args.input = output_csv_file
|
||||||
args.output = os.path.join('bin', bin_filename)
|
args.output = os.path.join('bin', bin_filename)
|
||||||
if args.keygen:
|
|
||||||
args.keyfile = 'keys-' + args.prefix + '-' + file_identifier_value
|
|
||||||
|
|
||||||
if is_encr:
|
if is_encr:
|
||||||
nvs_partition_gen.encrypt(args)
|
nvs_partition_gen.encrypt(args)
|
||||||
|
Reference in New Issue
Block a user