aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-09-28 04:26:52 +0000
committerNIIBE Yutaka <[email protected]>2023-09-28 04:26:52 +0000
commit1da40db03eba4aa056f7cdf8ef90292272a4147d (patch)
treea8f05596e5526f5025cc5395edfe12792e46939f
parentagent: fix tpm2d keytotpm handling (diff)
downloadgnupg-1da40db03eba4aa056f7cdf8ef90292272a4147d.tar.gz
gnupg-1da40db03eba4aa056f7cdf8ef90292272a4147d.zip
tpm2d: Check SWTPM environment variable for swtpm support.
* tpm2d/intel-tss.h (TSS_Create): Check SWTPM. -- Signed-off-by: James Bottomley <[email protected]>
-rw-r--r--tpm2d/intel-tss.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/tpm2d/intel-tss.h b/tpm2d/intel-tss.h
index 615f81e2f..53da5cee2 100644
--- a/tpm2d/intel-tss.h
+++ b/tpm2d/intel-tss.h
@@ -285,9 +285,15 @@ TSS_Create(TSS_CONTEXT **tssContext)
*/
if (intType)
{
- if (strcmp("socsim", intType) == 0) {
- tctildr = "mssim";
- }
+ if (strcmp("socsim", intType) == 0)
+ {
+ char *swtpm = getenv("SWTPM");
+
+ if (!swtpm || strlen(swtpm) == 0)
+ tctildr = "mssim";
+ else
+ tctildr = "swtpm";
+ }
else if (strcmp("dev", intType) == 0)
{
tctildr = "device";