7188b42174
- test: Fix test-crypto-secret when compiling without keyring support - aio-posix: fix build failure io_uring 2.2 Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
From edf3134ef2f98c7fd79f54a467631f091e52a980 Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Fri, 14 Apr 2023 13:42:52 +0200
|
|
Subject: [PATCH] test: Fix test-crypto-secret when compiling without keyring
|
|
support
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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.41.0.windows.1
|
|
|