Revert "TEMPORARY HACK: Disable verifying VERSION"

Message ID 20180914004922.24606-1-stewart@linux.ibm.com
State Accepted
Headers show
Series
  • Revert "TEMPORARY HACK: Disable verifying VERSION"
Related show

Checks

Context Check Description
snowpatch_ozlabs/make_check success Test make_check on branch master
snowpatch_ozlabs/apply_patch success master/apply_patch Successfully applied

Commit Message

Stewart Smith Sept. 14, 2018, 12:49 a.m.
This reverts commit f835684365273c5ff1b7c700ddc0f9c1a859363f.

Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
---
This needs to wait until all the bits are in place upstream in op-build
---
 core/flash.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Patch

diff --git a/core/flash.c b/core/flash.c
index 8e7b90e672c4..8f00d85e4651 100644
--- a/core/flash.c
+++ b/core/flash.c
@@ -823,12 +823,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 */