Showing with 13 additions and 8 deletions.

+4 −0 CHANGELOG.md

+1 −1 lib/tpm2_options.c

+8 −7 lib/tpm2_options.h
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 ## Changelog
+### 3.0.3 - 2017-15-18
+  * Tools that don't need a TPM to work no longer request
+    a TPM connection. Namely, tpm2_rc_decode
+  * Fix undefined references in libmarshal port.
 ### 3.0.2 - 2017-12-18
   * configure: enable code coverage option.
   * build: enable silent rules options.

diff --git a/lib/tpm2_options.c b/lib/tpm2_options.c
@@ -359,7 +359,7 @@ tpm2_option_code tpm2_handle_options (int argc, char **argv, char **envp,
         }
 	}
 
-    if (!(flags && flags->no_sapi)) {
+    if (!flags->no_sapi) {
 
         size_t i;
         bool found = false;

diff --git a/lib/tpm2_options.h b/lib/tpm2_options.h
@@ -46,18 +46,19 @@ typedef struct tpm2_options tpm2_options;
 typedef union tpm2_option_flags tpm2_option_flags;
 union tpm2_option_flags {
     struct {
-#define TPM2_OPTION_FLAG_VERBOSE       (1 << 0)
-        UINT8 verbose : 1;
-#define TPM2_OPTION_FLAG_QUIET         (1 << 1)
-        UINT8 quiet   : 1;
-#define TPM2_OPTION_FLAG_ENABLE_ERRATA (1 << 2)
+        UINT8 verbose        : 1;
+        UINT8 quiet          : 1;
         UINT8 enable_errata  : 1;
-#define TPM2_OPTION_NO_SAPI            (1 << 3)
-        UINT8 no_sapi : 1;
+        UINT8 no_sapi        : 1;
     };
     UINT8 all;
 };
 
+#define TPM2_OPTION_FLAG_VERBOSE       (1 << 0)
+#define TPM2_OPTION_FLAG_QUIET         (1 << 1)
+#define TPM2_OPTION_FLAG_ENABLE_ERRATA (1 << 2)
+#define TPM2_OPTION_NO_SAPI            (1 << 3)
+
 /**
  * This function pointer defines the interface for tcti initialization.
  * ALL tool supported TCTIs should implement this interface.