[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/23] test: Fix test-crypto-secret when compiling without keyring
From: |
Thomas Huth |
Subject: |
[PULL 04/23] test: Fix test-crypto-secret when compiling without keyring support |
Date: |
Thu, 20 Apr 2023 12:11:57 +0200 |
From: Juan Quintela <quintela@redhat.com>
Linux keyring support is protected by CONFIG_KEYUTILS.
We also need CONFIG_SECRET_KEYRING.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230414114252.1136-1-quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/unit/test-crypto-secret.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/unit/test-crypto-secret.c b/tests/unit/test-crypto-secret.c
index 34a4aecc12..147b4af828 100644
--- a/tests/unit/test-crypto-secret.c
+++ b/tests/unit/test-crypto-secret.c
@@ -24,7 +24,7 @@
#include "crypto/secret.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#ifdef CONFIG_KEYUTILS
+#if defined(CONFIG_KEYUTILS) && defined(CONFIG_SECRET_KEYRING)
#include "crypto/secret_keyring.h"
#include <keyutils.h>
#endif
@@ -128,7 +128,7 @@ static void test_secret_indirect_emptyfile(void)
g_free(fname);
}
-#ifdef CONFIG_KEYUTILS
+#if defined(CONFIG_KEYUTILS) && defined(CONFIG_SECRET_KEYRING)
#define DESCRIPTION "qemu_test_secret"
#define PAYLOAD "Test Payload"
@@ -268,7 +268,7 @@ static void test_secret_keyring_bad_key_access_right(void)
keyctl_unlink(key, KEY_SPEC_PROCESS_KEYRING);
}
-#endif /* CONFIG_KEYUTILS */
+#endif /* CONFIG_KEYUTILS && CONFIG_SECRET_KEYRING */
static void test_secret_noconv_base64_good(void)
{
@@ -571,7 +571,7 @@ int main(int argc, char **argv)
g_test_add_func("/crypto/secret/indirect/emptyfile",
test_secret_indirect_emptyfile);
-#ifdef CONFIG_KEYUTILS
+#if defined(CONFIG_KEYUTILS) && defined(CONFIG_SECRET_KEYRING)
g_test_add_func("/crypto/secret/keyring/good",
test_secret_keyring_good);
g_test_add_func("/crypto/secret/keyring/revoked_key",
@@ -582,7 +582,7 @@ int main(int argc, char **argv)
test_secret_keyring_bad_serial_key);
g_test_add_func("/crypto/secret/keyring/bad_key_access_right",
test_secret_keyring_bad_key_access_right);
-#endif /* CONFIG_KEYUTILS */
+#endif /* CONFIG_KEYUTILS && CONFIG_SECRET_KEYRING */
g_test_add_func("/crypto/secret/noconv/base64/good",
test_secret_noconv_base64_good);
--
2.31.1
- [PULL 00/23] First batch of testing and misc patches for 8.1, Thomas Huth, 2023/04/20
- [PULL 03/23] docs/cxl: Fix sentence, Thomas Huth, 2023/04/20
- [PULL 02/23] docs: Fix typo (wphx => whpx), Thomas Huth, 2023/04/20
- [PULL 01/23] hw: Add compat machines for 8.1, Thomas Huth, 2023/04/20
- [PULL 05/23] qtest: Don't assert on "-qtest chardev:myid", Thomas Huth, 2023/04/20
- [PULL 06/23] chardev: Allow setting file chardev input file on the command line, Thomas Huth, 2023/04/20
- [PULL 10/23] target/i386: Set family/model/stepping of the "max" CPU according to LM bit, Thomas Huth, 2023/04/20
- [PULL 08/23] travis.yml: Add missing 'flex', 'bison' packages to 'GCC (user)' job, Thomas Huth, 2023/04/20
- [PULL 14/23] softmmu: Make qtest.c target independent, Thomas Huth, 2023/04/20
- [PULL 07/23] travis.yml: Add missing clang-10 package to the 'Clang (disable-tcg)' job, Thomas Huth, 2023/04/20
- [PULL 04/23] test: Fix test-crypto-secret when compiling without keyring support,
Thomas Huth <=
- [PULL 13/23] include/exec: Provide the tswap() functions for target independent code, too, Thomas Huth, 2023/04/20
- [PULL 15/23] hw/display: Compile vga.c as target-independent code, Thomas Huth, 2023/04/20
- [PULL 12/23] softmmu/qtest: Move the target-specific pseries RTAS code out of qtest.c, Thomas Huth, 2023/04/20
- [PULL 17/23] hw/core: Move numa.c into the target independent source set, Thomas Huth, 2023/04/20
- [PULL 21/23] qtest: Move tpm_util_tis_transmit() into tpm-tis-utils.c and rename it, Thomas Huth, 2023/04/20
- [PULL 23/23] tests/vm/freebsd: Update to FreeBSD 13.2, Thomas Huth, 2023/04/20
- [PULL 09/23] tests/migration: Only run auto_converge in slow mode, Thomas Huth, 2023/04/20
- [PULL 11/23] hw/char: Move two more files from specific_ss to softmmu_ss, Thomas Huth, 2023/04/20
- [PULL 18/23] cpu: Remove parameter of list_cpus(), Thomas Huth, 2023/04/20
- [PULL 16/23] softmmu: Move dirtylimit.c into the target independent source set, Thomas Huth, 2023/04/20