diff options
| author | Simon Glass <[email protected]> | 2023-07-24 09:19:57 -0600 |
|---|---|---|
| committer | Simon Glass <[email protected]> | 2023-07-24 09:33:55 -0600 |
| commit | efda8ab201de0182c98d1038969c0189b2e3fe1f (patch) | |
| tree | 5ef03d1d8cffa3d4dfd45226b053ff727b704b9e /tools/binman/test | |
| parent | be71a05a417deb5fcea8e39e557f890626ab2352 (diff) | |
binman: Tidy up tests for pre-load entry type
Drop the use of a numbered key file since numbering is just for the test
devicetree files. Also adjust the tests to avoid putting a hard-coded
path to binman in the file, using the entry arg instead.
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'tools/binman/test')
| -rw-r--r-- | tools/binman/test/230_pre_load.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/231_pre_load_pkcs.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/232_pre_load_pss.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/233_pre_load_invalid_padding.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/234_pre_load_invalid_sha.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/235_pre_load_invalid_algo.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/236_pre_load_invalid_key.dts | 2 | ||||
| -rw-r--r-- | tools/binman/test/dev.key (renamed from tools/binman/test/230_dev.key) | 0 |
8 files changed, 7 insertions, 7 deletions
diff --git a/tools/binman/test/230_pre_load.dts b/tools/binman/test/230_pre_load.dts index c0c24729f82..e6d9ef40c6c 100644 --- a/tools/binman/test/230_pre_load.dts +++ b/tools/binman/test/230_pre_load.dts @@ -10,7 +10,7 @@ pre-load { content = <&image>; algo-name = "sha256,rsa2048"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/231_pre_load_pkcs.dts b/tools/binman/test/231_pre_load_pkcs.dts index 530638c56b6..66268cdb212 100644 --- a/tools/binman/test/231_pre_load_pkcs.dts +++ b/tools/binman/test/231_pre_load_pkcs.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/232_pre_load_pss.dts b/tools/binman/test/232_pre_load_pss.dts index 371e0fdb408..3008d3f4649 100644 --- a/tools/binman/test/232_pre_load_pss.dts +++ b/tools/binman/test/232_pre_load_pss.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "pss"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/233_pre_load_invalid_padding.dts b/tools/binman/test/233_pre_load_invalid_padding.dts index 9cb4cb570bc..bbe2d1ba869 100644 --- a/tools/binman/test/233_pre_load_invalid_padding.dts +++ b/tools/binman/test/233_pre_load_invalid_padding.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "padding"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/234_pre_load_invalid_sha.dts b/tools/binman/test/234_pre_load_invalid_sha.dts index 8ded98df533..29afd2e37e4 100644 --- a/tools/binman/test/234_pre_load_invalid_sha.dts +++ b/tools/binman/test/234_pre_load_invalid_sha.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha2560,rsa2048"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/235_pre_load_invalid_algo.dts b/tools/binman/test/235_pre_load_invalid_algo.dts index 145286caa3e..d6f6dd20cd9 100644 --- a/tools/binman/test/235_pre_load_invalid_algo.dts +++ b/tools/binman/test/235_pre_load_invalid_algo.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa20480"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/236_pre_load_invalid_key.dts b/tools/binman/test/236_pre_load_invalid_key.dts index df858c3a28b..f93bc9792cd 100644 --- a/tools/binman/test/236_pre_load_invalid_key.dts +++ b/tools/binman/test/236_pre_load_invalid_key.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa4096"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/230_dev.key b/tools/binman/test/dev.key index b36bad2cfb3..b36bad2cfb3 100644 --- a/tools/binman/test/230_dev.key +++ b/tools/binman/test/dev.key |