33 lines
982 B
Diff
33 lines
982 B
Diff
|
From 554a13f45c05faa388e028369492e9cc7dee5f13 Mon Sep 17 00:00:00 2001
|
||
|
|
From: William Roberts <william.c.roberts@intel.com>
|
||
|
|
Date: Mon, 5 Nov 2018 11:39:02 -0800
|
||
|
|
Subject: [PATCH] options: fix broken -T option
|
||
|
|
|
||
|
|
commit:
|
||
|
|
- 175e47711c72 lib/tpm2_options: restore TCTI configuration environment variables
|
||
|
|
|
||
|
|
Broke the option handling, effectively ignoring the -T/--tcti input. Honor that input
|
||
|
|
if specified and don't just run the default TCTI search unless it's not specified.
|
||
|
|
|
||
|
|
Signed-off-by: William Roberts <william.c.roberts@intel.com>
|
||
|
|
---
|
||
|
|
lib/tpm2_options.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/lib/tpm2_options.c b/lib/tpm2_options.c
|
||
|
|
index 2531948ecf7..006c46e4944 100644
|
||
|
|
--- a/lib/tpm2_options.c
|
||
|
|
+++ b/lib/tpm2_options.c
|
||
|
|
@@ -290,6 +290,8 @@ static tcti_conf tcti_get_config(const char *optstr) {
|
||
|
|
parse_env_tcti(optstr, &conf);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+ } else {
|
||
|
|
+ conf.name = strdup(optstr);
|
||
|
|
}
|
||
|
|
|
||
|
|
if (!conf.name) {
|
||
|
|
--
|
||
|
|
2.19.2
|
||
|
|
|