From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- .../tpm2-tools-5.1.1-fix-tpm-checkquote.patch | 34 ---------------------- ...testparms-fix-condition-for-negative-test.patch | 33 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch create mode 100644 app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch (limited to 'app-crypt/tpm2-tools/files') diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch deleted file mode 100644 index 73fb0e3f487a..000000000000 --- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001 -From: Alberto Planas -Date: Thu, 17 Jun 2021 11:07:25 +0200 -Subject: [PATCH] tpm2_checkquote: fix uninitialized variable - -The variable `temp_pcrs` is uninitialized, and later partially -uninitialized when reading the selection data from file. - -When activating lto optimizations, this bug presents itself showing an -error during the read of the quote: - -ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ... - -Fixes: #2767 - -Co-authored-by: Martin Liska -Signed-off-by: Alberto Planas ---- - tools/misc/tpm2_checkquote.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c -index 531508579..8d780f111 100644 ---- a/tools/misc/tpm2_checkquote.c -+++ b/tools/misc/tpm2_checkquote.c -@@ -376,7 +376,7 @@ static tool_rc init(void) { - TPM2B_ATTEST *msg = NULL; - TPML_PCR_SELECTION pcr_select; - tpm2_pcrs *pcrs; -- tpm2_pcrs temp_pcrs; -+ tpm2_pcrs temp_pcrs = {}; - tool_rc return_value = tool_rc_general_error; - - msg = message_from_file(ctx.msg_file_path); diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch new file mode 100644 index 000000000000..e1094647bdfd --- /dev/null +++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch @@ -0,0 +1,33 @@ +From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001 +From: Jonas Witschel +Date: Wed, 29 Sep 2021 17:08:07 +0200 +Subject: [PATCH] testparms: fix condition for negative test + +Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not +supported before negative test") is supposed to ensure that the negative test +is run only if ecc521 is *not* supported, but instead it runs the negative test +if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because camellia +was not supported, but since libtpms 0.9.0 added support for this algorithm, the +test suite fails now with swtpm. + +Signed-off-by: Jonas Witschel +--- + test/integration/tests/testparms.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/integration/tests/testparms.sh b/test/integration/tests/testparms.sh +index 8c3548e5..a587a60a 100644 +--- a/test/integration/tests/testparms.sh ++++ b/test/integration/tests/testparms.sh +@@ -63,7 +63,7 @@ else + fi + + # Attempt to specify a suite that is not supported (error from TPM) +-if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then ++if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then + if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then + echo "tpm2 testparms succeeded while it shouldn't or TPM failed" + exit 1 +-- +2.32.0 + -- cgit v1.2.3