mirror of
https://github.com/qemu/qemu.git
synced 2024-12-12 21:23:36 +08:00
test: Fix test-crypto-secret when compiling without keyring support
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>
This commit is contained in:
parent
63cec0506e
commit
9a29e02073
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user