[Skiboot] [PATCH] Revert "TEMPORARY HACK: Disable verifying VERSION"

Stewart Smith stewart at linux.ibm.com
Fri Oct 26 10:24:34 AEDT 2018


Stewart Smith <stewart at linux.ibm.com> writes:
> This reverts commit f835684365273c5ff1b7c700ddc0f9c1a859363f.
>
> Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
> ---
>  core/flash.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/core/flash.c b/core/flash.c
> index 065fde290d58..11824a449449 100644
> --- a/core/flash.c
> +++ b/core/flash.c
> @@ -848,12 +848,7 @@ done_reading:
>  	 * Verify and measure the retrieved PNOR partition as part of the
>  	 * secure boot and trusted boot requirements
>  	 */
> -	/*
> -	 * FIXME: TEMPORARY HACK: Don't verify VERSION until all bits of code
> -	 * to produce a signed VERSION partition are upstream for a while.
> -	 */
> -	if (id != RESOURCE_ID_VERSION)
> -		secureboot_verify(id, buf, *len);
> +	secureboot_verify(id, buf, *len);
>  	trustedboot_measure(id, buf, *len);
>  
>  	/* Find subpartition */

Merged to master as of 4b8cc05a94513816d43fb8bd6178896b430af08f.

Let's see how we go now :)

-- 
Stewart Smith
OPAL Architect, IBM.



More information about the Skiboot mailing list