35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
From 0789bf264a108c4718875a050d00b1fdee4478b7 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
|
||
|
|
Content-type: text/plain
|
||
|
|
|
||
|
|
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 8c3548e58f39..a587a60a34cf 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.35.3
|
||
|
|
|