Index: tests/tpm_lite/earlynvram.c |
diff --git a/tests/tpm_lite/earlynvram.c b/tests/tpm_lite/earlynvram.c |
index c34a3ad1a17f698e92975662e945b86203afdcf8..fa4583383f9b2e6ef2696b13cb3e5497c920f43b 100644 |
--- a/tests/tpm_lite/earlynvram.c |
+++ b/tests/tpm_lite/earlynvram.c |
@@ -11,43 +11,19 @@ |
#include <stdlib.h> |
#include "tlcl.h" |
+#include "tlcl_tests.h" |
#include "utility.h" |
#define INDEX0 0xcafe |
int main(int argc, char** argv) { |
- uint32_t perm; |
- uint32_t result; |
uint32_t x; |
TlclLibInit(); |
- TlclStartup(); |
- TlclContinueSelfTest(); |
- |
- do { |
- result = TlclAssertPhysicalPresence(); |
- printf("result of AssertPP = %d\n", result); |
- } while (result == TPM_E_DOING_SELFTEST || |
- result == TPM_E_NEEDS_SELFTEST); |
- |
- if (result != TPM_SUCCESS) { |
- error("AssertPP failed with error %d\n", result); |
- } |
- |
- do { |
- result = TlclRead(INDEX0, (uint8_t*) &x, sizeof(x)); |
- printf("result of ReadValue = %d\n", result); |
- } while (result == TPM_E_DOING_SELFTEST || |
- result == TPM_E_NEEDS_SELFTEST); |
- |
- if (result == TPM_E_BADINDEX) { |
- VBDEBUG(("creating INDEX0\n")); |
- perm = TPM_NV_PER_PPWRITE; |
- TlclDefineSpace(INDEX0, perm, sizeof(uint32_t)); |
- } else if (result != TPM_SUCCESS) { |
- error("Read failed with result %d\n", result); |
- } |
- |
- printf("Test completed successfully\n"); |
- exit(0); |
+ TPM_CHECK(TlclStartup()); |
+ TPM_CHECK(TlclContinueSelfTest()); |
+ TPM_CHECK(TlclAssertPhysicalPresence()); |
+ TPM_CHECK(TlclRead(INDEX0, (uint8_t*) &x, sizeof(x))); |
+ printf("TEST SUCCEEDED\n"); |
+ return 0; |
} |