tpm-tools: Fix gcc6 compile issue

.8/src/tpm_mgmt/tpm_present.c
| ../../../tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c: In function 'main':
| ../../../tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c:358:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
|      if (szTpmPasswd && !isWellKnown)
|      ^~
| ../../../tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c:360:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
|   return iRc;
|   ^~~~~~

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2016-10-15 10:59:04 -07:00
parent 399e636c9f
commit 67cfe62b20
2 changed files with 25 additions and 0 deletions
@@ -0,0 +1,24 @@
Index: tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c
===================================================================
--- tpm-tools-1.3.8.orig/src/tpm_mgmt/tpm_present.c
+++ tpm-tools-1.3.8/src/tpm_mgmt/tpm_present.c
@@ -349,13 +349,13 @@ int main(int argc, char **argv)
}
} while (flags[++i].name);
- out_success:
+out_success:
logSuccess(argv[0]);
iRc = 0;
- out_close:
+out_close:
contextClose(hContext);
- out:
- if (szTpmPasswd && !isWellKnown)
- shredPasswd( szTpmPasswd );
- return iRc;
+out:
+ if (szTpmPasswd && !isWellKnown)
+ shredPasswd( szTpmPasswd );
+return iRc;
}
+1
View File
@@ -15,6 +15,7 @@ SRC_URI += " \
http://downloads.sourceforge.net/project/trousers/${BPN}/${PV}/${BP}.tar.gz \
file://tpm-tools-extendpcr.patch \
file://03-fix-bool-error-parseStringWithValues.patch \
file://gcc6_missleading_indent_fix.patch \
"
SRC_URI[md5sum] = "85a978c4e03fefd4b73cbeadde7c4d0b"