Index: firmware/lib/rollback_index.c |
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c |
index ba1c3e982e801eb81ecd0b73e884475cf90dee07..1540bd03d9a180e6397d4a97acbe006be7c49d26 100644 |
--- a/firmware/lib/rollback_index.c |
+++ b/firmware/lib/rollback_index.c |
@@ -106,9 +106,9 @@ static uint32_t InitializeSpaces(void) { |
* redefine the NVRAM spaces. */ |
RETURN_ON_FAILURE(TPMClearAndReenable()); |
- /* The TPM will not enforce the NV authorization restrictions until the |
- * execution of a TPM_NV_DefineSpace with the handle of TPM_NV_INDEX_LOCK. |
- * Create that space if it doesn't already exist. */ |
+ /* The TPM will not enforce the NV authorization restrictions until the |
+ * execution of a TPM_NV_DefineSpace with the handle of TPM_NV_INDEX_LOCK. |
+ * Create that space if it doesn't already exist. */ |
RETURN_ON_FAILURE(TlclGetFlags(NULL, NULL, &nvlocked)); |
VBDEBUG(("TPM: nvlocked=%d\n", nvlocked)); |
if (!nvlocked) { |
@@ -230,7 +230,7 @@ static uint32_t BackupKernelSpace(void) { |
} |
/* Checks for transitions between protected mode to developer mode. When going |
- * into developer mode, clear the TPM. |
+ * into or out of developer mode, clear the TPM. |
*/ |
static uint32_t CheckDeveloperModeTransition(uint32_t current_developer) { |
uint32_t past_developer; |
@@ -337,6 +337,7 @@ uint32_t RollbackFirmwareSetup(int developer_mode) { |
* environment, don't even talk to the TPM. */ |
TlclLibInit(); |
TlclStartup(); |
+ TlclSelfTestFull(); |
semenzato
2010/08/05 19:50:53
This has changed a lot and I don't understand why
|
#endif |
return TPM_SUCCESS; |
} |
@@ -360,6 +361,7 @@ uint32_t RollbackKernelRecovery(int developer_mode) { |
* environment, don't even talk to the TPM. */ |
TlclLibInit(); |
TlclStartup(); |
+ TlclSelfTestFull(); |
#endif |
return TPM_SUCCESS; |
} |