The vboot tests only consider rsa for test with global signature. To prepare the integration of test with ecdsa test, the signature algo is now explicit.
Signed-off-by: Philippe Reynes <[email protected]> --- v3: - initial version test/py/tests/test_vboot.py | 12 ++++++------ ...binman-pss.dts => sandbox-binman-rsa2048-pss.dts} | 0 ...sandbox-binman.dts => sandbox-binman-rsa2048.dts} | 0 ...pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} | 0 ...-global.dts => sandbox-u-boot-global-rsa2048.dts} | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename test/py/tests/vboot/{sandbox-binman-pss.dts => sandbox-binman-rsa2048-pss.dts} (100%) rename test/py/tests/vboot/{sandbox-binman.dts => sandbox-binman-rsa2048.dts} (100%) rename test/py/tests/vboot/{sandbox-u-boot-global-pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} (100%) rename test/py/tests/vboot/{sandbox-u-boot-global.dts => sandbox-u-boot-global-rsa2048.dts} (100%) diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index 4e4d9529031..22865f653c5 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -503,7 +503,7 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, dtb) run_bootm(sha_algo, 'multi required key', '', False) - def test_global_sign(sha_algo, padding, sign_options): + def test_global_sign(sha_algo, sig_algo, padding, sign_options): """Test global image signature with the given hash algorithm and padding. Args: @@ -512,14 +512,14 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, rsa signature algorithm. """ - dtb = '%ssandbox-u-boot-global%s.dtb' % (tmpdir, padding) + dtb = '%ssandbox-u-boot-global%s%s.dtb' % (tmpdir, sig_algo, padding) ubman.config.dtb = dtb # Compile our device tree files for kernel and U-Boot. These are # regenerated here since mkimage will modify them (by adding a # public key) below. dtc('sandbox-kernel.dts', ubman, dtc_args, datadir, tmpdir, dtb) - dtc_options('sandbox-u-boot-global%s.dts' % padding, '-p 1024') + dtc_options('sandbox-u-boot-global%s%s.dts' % (sig_algo, padding), '-p 1024') # Build the FIT with dev key (keys NOT required). This adds the # signature into sandbox-u-boot.dtb, NOT marked 'required'. @@ -528,11 +528,11 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, # Build the dtb for binman that define the pre-load header # with the global sigature. - dtc('sandbox-binman%s.dts' % padding, ubman, dtc_args, datadir, tmpdir, dtb) + dtc('sandbox-binman%s%s.dts' % (sig_algo, padding), ubman, dtc_args, datadir, tmpdir, dtb) # Run binman to create the final image with the not signed fit # and the pre-load header that contains the global signature. - run_binman('sandbox-binman%s.dtb' % padding) + run_binman('sandbox-binman%s%s.dtb' % (sig_algo, padding)) # Check that the signature is correctly verified by u-boot run_bootm(sha_algo, 'global image signature', @@ -582,7 +582,7 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, try: ubman.config.dtb = dtb if global_sign: - test_global_sign(sha_algo, padding, sign_options) + test_global_sign(sha_algo, sig_algo, padding, sign_options) elif required: test_required_key(sha_algo, sig_algo, padding, sign_options) else: diff --git a/test/py/tests/vboot/sandbox-binman-pss.dts b/test/py/tests/vboot/sandbox-binman-rsa2048-pss.dts similarity index 100% rename from test/py/tests/vboot/sandbox-binman-pss.dts rename to test/py/tests/vboot/sandbox-binman-rsa2048-pss.dts diff --git a/test/py/tests/vboot/sandbox-binman.dts b/test/py/tests/vboot/sandbox-binman-rsa2048.dts similarity index 100% rename from test/py/tests/vboot/sandbox-binman.dts rename to test/py/tests/vboot/sandbox-binman-rsa2048.dts diff --git a/test/py/tests/vboot/sandbox-u-boot-global-pss.dts b/test/py/tests/vboot/sandbox-u-boot-global-rsa2048-pss.dts similarity index 100% rename from test/py/tests/vboot/sandbox-u-boot-global-pss.dts rename to test/py/tests/vboot/sandbox-u-boot-global-rsa2048-pss.dts diff --git a/test/py/tests/vboot/sandbox-u-boot-global.dts b/test/py/tests/vboot/sandbox-u-boot-global-rsa2048.dts similarity index 100% rename from test/py/tests/vboot/sandbox-u-boot-global.dts rename to test/py/tests/vboot/sandbox-u-boot-global-rsa2048.dts -- 2.43.0
