Blame options-fix-broken-T-option.patch

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