Refactor rollback interface for LoadKernel(), LoadFirmware().

firmware/linktest/main.c

 
 #include "cgptlib.h"
 #include "load_firmware_fw.h"
 #include "load_kernel_fw.h"
 #include "rollback_index.h"
 #include "tlcl.h"
 #include "vboot_common.h"
 #include "vboot_kernel.h"
 
 int main(void)
 {
   uint16_t x, y;
 
   /* cgptlib.h */
   GptInit(0);
   GptNextKernelEntry(0, 0, 0);
   GptUpdateKernelEntry(0, 0);
 
   /* load_firmware_fw.h */
   UpdateFirmwareBodyHash(0, 0, 0);
   LoadFirmware(0);
 
   /* load_kernel_fw.h */
   LoadKernel(0);
 
   /* rollback_index.h */
-  SetupTPM(0, 0);
-  GetStoredVersions(0, &x, &y);
-  WriteStoredVersions(0, 0, 0);
-  LockFirmwareVersions();
-  LockKernelVersionsByLockingPP();
+  RollbackFirmwareSetup(0, &x, &y);
+  RollbackFirmwareWrite(0, 0);
+  RollbackFirmwareLock();
+  RollbackKernelRecovery(0);
+  RollbackKernelRead(&x, &y);
+  RollbackKernelWrite(0, 0);
+  RollbackKernelLock();
 
   /* tlcl.h */
   TlclLibInit();
   TlclStartup();
   TlclSelftestfull();
   TlclContinueSelfTest();
   TlclDefineSpace(0, 0, 0);
   TlclWrite(0, 0, 0);
   TlclRead(0, 0, 0);
   TlclWriteLock(0);
@@ skipping 19 matching lines @@
   PublicKeyCopy(0, 0);
   PublicKeyToRSA(0);
   VerifyData(0, 0, 0);
   VerifyDigest(0, 0, 0);
   KeyBlockVerify(0, 0, 0);
   VerifyFirmwarePreamble2(0, 0, 0);
   VerifyKernelPreamble2(0, 0, 0);
 
   return 0;
 }