diff options
Diffstat (limited to 'utility')
-rw-r--r-- | utility/mount-encrypted.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/utility/mount-encrypted.c b/utility/mount-encrypted.c index 94f54d8a..2c975a39 100644 --- a/utility/mount-encrypted.c +++ b/utility/mount-encrypted.c @@ -113,21 +113,12 @@ static int has_tpm = 0; static void tpm_init(void) { - int tpm; + uint32_t result; DEBUG("Opening TPM"); - tpm = open(kTpmDev, O_RDWR); - if (tpm >= 0) { - has_tpm = 1; - close(tpm); - } - else { - /* TlclLibInit does not fail, it exits, so instead, - * have it open /dev/null if the TPM is not available. - */ - setenv("TPM_DEVICE_PATH", kNullDev, 1); - } - TlclLibInit(); + setenv("TPM_NO_EXIT", "1", 1); + result = TlclLibInit(); + has_tpm = (result == TPM_SUCCESS); INFO("TPM %s", has_tpm ? "ready" : "not available"); } |