diff options
| author | Claudio Carvalho <cclaudio@linux.vnet.ibm.com> | 2016-10-31 01:11:41 -0200 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-11-02 16:48:37 +1100 |
| commit | 20db137e82039f9dafd42352525f1e8a8b7995ea (patch) | |
| tree | 3402737360f5ee8d480baed5299b875db4bfef42 /core | |
| parent | 3dc16bb7cae2af752466f38ec928f75279da03f6 (diff) | |
| download | skiboot-20db137e82039f9dafd42352525f1e8a8b7995ea.zip skiboot-20db137e82039f9dafd42352525f1e8a8b7995ea.tar.gz skiboot-20db137e82039f9dafd42352525f1e8a8b7995ea.tar.bz2 | |
libstb: remove subid argument from sb_verify and tb_measure
We always verify and measure an image as a whole, never its subpartition
(if exists).
This removes the subid argument from sb_verify() and tb_measure()
functions, and also reflects the change to the callers, STB interface
and STB documentation.
Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/flash.c | 4 | ||||
| -rw-r--r-- | core/init.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/flash.c b/core/flash.c index a704380..5ab7fc8 100644 --- a/core/flash.c +++ b/core/flash.c @@ -655,8 +655,8 @@ done_reading: * Verify and measure the retrieved PNOR partition as part of the * secure boot and trusted boot requirements */ - sb_verify(id, subid, buf, *len); - tb_measure(id, subid, buf, *len); + sb_verify(id, buf, *len); + tb_measure(id, buf, *len); /* Find subpartition */ if (subid != RESOURCE_SUBID_NONE) { diff --git a/core/init.c b/core/init.c index dbb381f..9d4ab60 100644 --- a/core/init.c +++ b/core/init.c @@ -415,10 +415,10 @@ static bool load_kernel(void) if (do_stb) { - sb_verify(RESOURCE_ID_KERNEL, RESOURCE_SUBID_NONE, - stb_container, kernel_size + SECURE_BOOT_HEADERS_SIZE); - tb_measure(RESOURCE_ID_KERNEL, RESOURCE_SUBID_NONE, - stb_container, kernel_size + SECURE_BOOT_HEADERS_SIZE); + sb_verify(RESOURCE_ID_KERNEL, stb_container, + kernel_size + SECURE_BOOT_HEADERS_SIZE); + tb_measure(RESOURCE_ID_KERNEL, stb_container, + kernel_size + SECURE_BOOT_HEADERS_SIZE); } /* |