forked from pool/tpm2.0-tools
Marcus Meissner
df8d6a816d
- update to version 2.1.0: - dropped 0002-kdfa-use-openssl-for-hmac-not-tpm.patch, was backported upstream in commit 788a17abbe0000c560935ef9f31c9a6892d9ea33 - this version now can interact with the new resource manager tpm2.0-abrmd - Upstream changes: * Fix readx and writex on multiple EINTR returns. * Add support for the tabrmd TCTI. This is the new default. * Change default socket port from 2323 (the old resourcemgr) to 2321 (default simulator port). * Cherry-pick fix for CVE-2017-7524. * Fix tpm2_listpcr command line option handling. * Fix tpm2_getmanufec memory issues. OBS-URL: https://build.opensuse.org/request/show/517963 OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=28
27 lines
989 B
Diff
27 lines
989 B
Diff
Index: tpm2-tools-2.1.0/tools/main.c
|
|
===================================================================
|
|
--- tpm2-tools-2.1.0.orig/tools/main.c
|
|
+++ tpm2-tools-2.1.0/tools/main.c
|
|
@@ -61,7 +61,7 @@ main (int argc,
|
|
execute_man (argv[0], envp);
|
|
fprintf (stderr,
|
|
"failed to load manpage, check your environment / PATH\n");
|
|
- /* no break */
|
|
+ /* FALLTHROUGH */
|
|
case 2:
|
|
exit (1);
|
|
}
|
|
Index: tpm2-tools-2.1.0/tools/tpm2_dump_capability.c
|
|
===================================================================
|
|
--- tpm2-tools-2.1.0.orig/tools/tpm2_dump_capability.c
|
|
+++ tpm2-tools-2.1.0/tools/tpm2_dump_capability.c
|
|
@@ -595,7 +595,7 @@ dump_tpm_capability (TPMU_CAPABILITIES
|
|
case TPM_CAP_COMMANDS:
|
|
dump_command_attr_array (capabilities->command.commandAttributes,
|
|
capabilities->command.count);
|
|
- /* no break */
|
|
+ /* FALLTHROUGH */
|
|
default:
|
|
return 1;
|
|
}
|