update to YES/NO removal

Signed-off-by: William Roberts <william.c.roberts@intel.com>
tpm2-software · Mar 1, 2018 · 0f7b2f6 · 0f7b2f6
1 parent 7a09eaf
commit 0f7b2f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/tools/tpm2_clearlock.c b/tools/tpm2_clearlock.c
@@ -52,7 +52,7 @@ static clearlock_ctx ctx = {
 static bool clearlock(TSS2_SYS_CONTEXT *sapi_context) {
 
     TPMI_RH_CLEAR rh = ctx.platform ? TPM2_RH_PLATFORM : TPM2_RH_LOCKOUT;
-    TPMI_YES_NO disable = ctx.clear ? NO : YES;
+    TPMI_YES_NO disable = ctx.clear ? 0 : 1;
 
     LOG_INFO ("Sending TPM2_ClearControl(%s) command on %s",
             ctx.clear ? "CLEAR" : "SET",

diff --git a/tools/tpm2_encryptdecrypt.c b/tools/tpm2_encryptdecrypt.c
@@ -68,7 +68,6 @@ struct tpm_encrypt_decrypt_ctx {
 
 static tpm_encrypt_decrypt_ctx ctx = {
     .session_data = TPMS_AUTH_COMMAND_EMPTY_INIT,
-    .is_decrypt = NO,
     .data = TPM2B_EMPTY_INIT,
 };
 
@@ -139,7 +138,7 @@ static bool on_option(char key, char *value) {
         ctx.flags.P = 1;
         break;
     case 'D':
-        ctx.is_decrypt = YES;
+        ctx.is_decrypt = 1;
         break;
     case 'I':
         ctx.data.size = sizeof(ctx.data.buffer);

diff --git a/tools/tpm2_flushcontext.c b/tools/tpm2_flushcontext.c
@@ -74,7 +74,7 @@ get_capability_handles(TSS2_SYS_CONTEXT *sapi_ctx, UINT32 property,
                                 NULL);
     if (rval != TSS2_RC_SUCCESS) {
         LOG_PERR(Tss2_Sys_GetCapability, rval);
-    } else if (more_data == YES) {
+    } else if (more_data) {
         LOG_WARN("More data to be queried: capability: 0x%x, property: "
                  "0x%x", TPM2_CAP_HANDLES, property);
     }

diff --git a/tools/tpm2_getcap.c b/tools/tpm2_getcap.c
@@ -877,7 +877,7 @@ get_tpm_capability_all (TSS2_SYS_CONTEXT *sapi_ctx,
         LOG_ERR("Failed to GetCapability: capability: 0x%x, property: 0x%x",
                  options.capability, options.property);
         LOG_PERR(Tss2_Sys_GetCapability, rval);
-    } else if (more_data == YES) {
+    } else if (more_data) {
         LOG_WARN("More data to be queried: capability: 0x%x, property: "
                  "0x%x\n", options.capability, options.property);
     }