vboot/secdata: remove DISABLE_ROLLBACK_TPM constant

This constant triggered different implementations of the two
functions RollbackFwmpRead and RollbackKernelLock, whose
overridden implementation would then be relied on in various
tests.  Instead, directly override these functions within the
tests where they are required.

The overridden implementations were also used in
utilities/load_kernel_test.c, but this utility is currently
broken and not in active use.  If we would like to get it working
again, simply override these two functions directly in the C
file, just as is done for unit tests.  (See b:139839429.)

BUG=b:124141368, chromium:972956
TEST=make clean && make runtests
BRANCH=none

Change-Id: I0a4d24ea4ae4182b7f4f258860de6f712dae1555
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1765169
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

4 files changed, 41 insertions, 6 deletions

diff --git a/tests/rollback_index2_tests.c b/tests/rollback_index2_tests.c
index 9df8b06d..b8ebc80e 100644
--- a/tests/rollback_index2_tests.c
+++ b/tests/rollback_index2_tests.c
@@ -254,9 +254,6 @@ uint32_t TlclGetPermissions(uint32_t index, uint32_t* permissions)
 /****************************************************************************/
 /* Tests for CRC errors  */
 
-extern uint32_t ReadSpaceFirmware(RollbackSpaceFirmware *rsf);
-extern uint32_t WriteSpaceFirmware(RollbackSpaceFirmware *rsf);
-
 static void FirmwareSpaceTest(void)
 {
 	RollbackSpaceFirmware rsf;
@@ -290,9 +287,6 @@ static void FirmwareSpaceTest(void)
 		    "tlcl calls");
 }
 
-extern uint32_t ReadSpaceKernel(RollbackSpaceKernel *rsk);
-extern uint32_t WriteSpaceKernel(RollbackSpaceKernel *rsk);
-
 static void KernelSpaceTest(void)
 {
 	RollbackSpaceKernel rsk;
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 49a4233a..1791dc71 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -127,6 +127,11 @@ static void ResetMocks(void)
 }
 
 /* Mock functions */
+uint32_t RollbackKernelLock(int recovery_mode)
+{
+	return TPM_SUCCESS;
+}
+
 struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c)
 {
 	return &gbb;
diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c
index bd584395..f07fc2d9 100644
--- a/tests/vboot_api_kernel5_tests.c
+++ b/tests/vboot_api_kernel5_tests.c
@@ -19,6 +19,7 @@
 #include "2struct.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"
+#include "rollback_index.h"
 #include "test_common.h"
 #include "vb2_common.h"
 #include "vboot_api.h"
@@ -115,6 +116,36 @@ struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c)
 	return &gbb;
 }
 
+uint32_t ReadSpaceFirmware(RollbackSpaceFirmware *rsk)
+{
+	return VB2_SUCCESS;
+}
+
+uint32_t WriteSpaceFirmware(RollbackSpaceFirmware *rsk)
+{
+	return VB2_SUCCESS;
+}
+
+uint32_t ReadSpaceKernel(RollbackSpaceKernel *rsk)
+{
+	return VB2_SUCCESS;
+}
+
+uint32_t WriteSpaceKernel(RollbackSpaceKernel *rsk)
+{
+	return VB2_SUCCESS;
+}
+
+uint32_t RollbackKernelLock(int recovery_mode)
+{
+	return TPM_SUCCESS;
+}
+
+uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp)
+{
+	return TPM_SUCCESS;
+}
+
 vb2_error_t vb2ex_read_resource(struct vb2_context *c,
 				enum vb2_resource_index index, uint32_t offset,
 				void *buf, uint32_t size)
diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c
index 1a0c6175..14e0aa30 100644
--- a/tests/vboot_detach_menu_tests.c
+++ b/tests/vboot_detach_menu_tests.c
@@ -129,6 +129,11 @@ static void ResetMocksForManualRecovery(void)
 }
 
 /* Mock functions */
+uint32_t RollbackKernelLock(int recovery_mode)
+{
+	return TPM_SUCCESS;
+}
+
 struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c)
 {
 	return &gbb;