VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/DcsCfg/DcsCfgMain.c
diff options
context:
space:
mode:
authorkavsrf <kavsrf@gmail.com>2017-04-17 23:30:06 +0300
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-18 15:41:16 +0200
commit3058711f8b12cf11585e0eda2a1b573f0d871667 (patch)
tree3bfcf8f345924c10e0e11fd266b7b4ab133fbe54 /DcsCfg/DcsCfgMain.c
parent3cddd24df26085682c819a3c8e9e3ce21a2872da (diff)
downloadVeraCrypt-DCS-3058711f8b12cf11585e0eda2a1b573f0d871667.tar.gz
VeraCrypt-DCS-3058711f8b12cf11585e0eda2a1b573f0d871667.zip
TPM 2.0
Diffstat (limited to 'DcsCfg/DcsCfgMain.c')
-rw-r--r--DcsCfg/DcsCfgMain.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/DcsCfg/DcsCfgMain.c b/DcsCfg/DcsCfgMain.c
index 3abd759..5e5d819 100644
--- a/DcsCfg/DcsCfgMain.c
+++ b/DcsCfg/DcsCfgMain.c
@@ -29,6 +29,7 @@ https://opensource.org/licenses/LGPL-3.0
#include "common/Tcdefs.h"
#include "crypto/cpu.h"
#include "Library/DcsCfgLib.h"
+#include "../Include/Library/DcsTpmLib.h"
//////////////////////////////////////////////////////////////////////////
@@ -368,7 +369,14 @@ DcsCfgMain(
opt2++;
}
ePcr = (UINT32)StrDecimalToUintn(opt2);
- Tpm12ListPcrs(sPcr, ePcr);
+ res = GetTpm();
+ if (!EFI_ERROR(res)) {
+ if (gTpm->TpmVersion == 0x102) {
+ Tpm12ListPcrs(sPcr, ePcr);
+ } else {
+ Tpm2ListPcrs(sPcr, ePcr);
+ }
+ }
}
if (ShellCommandLineGetFlag(Package, OPT_TPM_NVLIST)) {
@@ -376,7 +384,7 @@ DcsCfgMain(
}
if (ShellCommandLineGetFlag(Package, OPT_TPM_CFG)) {
- Tpm12DcsConfigure();
+ TpmDcsConfigure();
}
// Graph