diff options
| author |   Christopher Byrne <salah.coronya@gmail.com> | 2021-10-04 20:27:44 -0500 |
|---|---|---|
| committer |   Ionen Wolkens <ionen@gentoo.org> | 2021-10-06 06:56:17 -0400 |
| commit | 90e9e0dc896c27dde200b18d51d0fff7656258d4 (patch) | |
| tree | acc36999a2c4d01b4f492085f5dcf8029e316d7d /app-crypt | |
| parent | dev-lua/mpack: update homepage (diff) | |
| download | gentoo-90e9e0dc896c27dde200b18d51d0fff7656258d4.tar.gz gentoo-90e9e0dc896c27dde200b18d51d0fff7656258d4.tar.bz2 gentoo-90e9e0dc896c27dde200b18d51d0fff7656258d4.zip | |
app-crypt/tpm2-tools: Fix broken test exposed in libtpms-0.9.0
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch | 33 | ||||
| -rw-r--r-- | app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild | 1 |
2 files changed, 34 insertions, 0 deletions
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 <git@diabonas.de> +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 <git@diabonas.de> +--- + 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 + diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild index 87c3b2f56979..f5db2002958f 100644 --- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild +++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild @@ -40,6 +40,7 @@ BDEPEND="virtual/pkgconfig PATCHES=( "${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch" + "${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch" ) src_prepare() { |