From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Ed Maste <emaste@freebsd.org>,
Michael Roth <mdroth@linux.vnet.ibm.com>,
qemu-block@nongnu.org, Stefan Weil <sw@weilnetz.de>,
Xie Changlong <xiechanglong.d@gmail.com>,
Peter Lieven <pl@kamp.de>, Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Wen Congyang <wencongyang2@huawei.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Li-Wen Hsu <lwhsu@freebsd.org>
Subject: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw
Date: Sun, 13 Sep 2020 06:44:17 +0800 [thread overview]
Message-ID: <20200912224431.1428-14-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200912224431.1428-1-luoyonggang@gmail.com>
Fixes following tests on msys2/mingw
'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
tasn1, crypto],
'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', 'crypto-tls-psk-helpers.c',
tasn1, crypto],
'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c',
tasn1, io, crypto]}
These tests are failure with:
ERROR test-crypto-tlscredsx509 - missing test plan
ERROR test-crypto-tlssession - missing test plan
ERROR test-io-channel-tls - missing test plan
Because on win32 those test case are all disabled in the header
Add qemu_socket_pair for cross platform support, convert file system
handling functions to glib
Add qemu_link function instead posix only link function.
Use send ad recv from qemu that convert Windows Socks error
to errno properly.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
tests/crypto-tls-x509-helpers.c | 169 ++++++++++++++++++++++++++++++-
tests/crypto-tls-x509-helpers.h | 9 +-
tests/test-crypto-tlscredsx509.c | 47 +++++----
tests/test-crypto-tlssession.c | 68 +++++++------
tests/test-io-channel-tls.c | 51 ++++++----
5 files changed, 266 insertions(+), 78 deletions(-)
diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c
index 01b3daf358..c624d8799b 100644
--- a/tests/crypto-tls-x509-helpers.c
+++ b/tests/crypto-tls-x509-helpers.c
@@ -23,6 +23,8 @@
#include "crypto-tls-x509-helpers.h"
#include "crypto/init.h"
#include "qemu/sockets.h"
+#include <glib.h>
+#include <glib/gstdio.h>
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
@@ -133,7 +135,7 @@ void test_tls_init(const char *keyfile)
void test_tls_cleanup(const char *keyfile)
{
asn1_delete_structure(&pkix_asn1);
- unlink(keyfile);
+ g_remove(keyfile);
}
/*
@@ -501,8 +503,171 @@ void test_tls_discard_cert(QCryptoTLSTestCertReq *req)
req->crt = NULL;
if (getenv("QEMU_TEST_DEBUG_CERTS") == NULL) {
- unlink(req->filename);
+ g_remove(req->filename);
}
}
+int qemu_link(const char *exist_path1, const char *new_path2)
+{
+#ifdef _WIN32
+ g_autofree gchar *current_dir = g_get_current_dir();
+ g_autofree gchar *full_path = g_build_filename(current_dir, exist_path1, NULL);
+ return CreateSymbolicLinkA(new_path2, full_path, 0 | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE) ? 0 : -1;
+#else
+ return link(exist_path1, new_path2);
+#endif
+}
+
+#ifdef _WIN32
+
+static int __stream_socketpair(struct addrinfo* addr_info, int sock[2]){
+ SOCKET listener, client, server;
+ int opt = 1;
+
+ listener = server = client = INVALID_SOCKET;
+ listener = socket(addr_info->ai_family, addr_info->ai_socktype, addr_info->ai_protocol);
+ if (INVALID_SOCKET == listener)
+ goto fail;
+
+ setsockopt(listener, SOL_SOCKET, SO_REUSEADDR,(const char*)&opt, sizeof(opt));
+
+ if(SOCKET_ERROR == bind(listener, addr_info->ai_addr, addr_info->ai_addrlen))
+ goto fail;
+
+ if (SOCKET_ERROR == getsockname(listener, addr_info->ai_addr, (int*)&addr_info->ai_addrlen))
+ goto fail;
+
+ if(SOCKET_ERROR == listen(listener, 5))
+ goto fail;
+
+ client = socket(addr_info->ai_family, addr_info->ai_socktype, addr_info->ai_protocol);
+
+ if (INVALID_SOCKET == client)
+ goto fail;
+
+ if (SOCKET_ERROR == connect(client,addr_info->ai_addr,addr_info->ai_addrlen))
+ goto fail;
+
+ server = accept(listener, 0, 0);
+
+ if (INVALID_SOCKET == server)
+ goto fail;
+
+ closesocket(listener);
+
+ sock[0] = client;
+ sock[1] = server;
+
+ return 0;
+fail:
+ if(INVALID_SOCKET!=listener)
+ closesocket(listener);
+ if (INVALID_SOCKET!=client)
+ closesocket(client);
+ return -1;
+}
+
+static int __dgram_socketpair(struct addrinfo* addr_info, int sock[2])
+{
+ SOCKET client, server;
+ struct addrinfo addr, *result = NULL;
+ const char* address;
+ int opt = 1;
+
+ server = client = INVALID_SOCKET;
+
+ server = socket(addr_info->ai_family, addr_info->ai_socktype, addr_info->ai_protocol);
+ if (INVALID_SOCKET == server)
+ goto fail;
+
+ setsockopt(server, SOL_SOCKET,SO_REUSEADDR, (const char*)&opt, sizeof(opt));
+
+ if(SOCKET_ERROR == bind(server, addr_info->ai_addr, addr_info->ai_addrlen))
+ goto fail;
+
+ if (SOCKET_ERROR == getsockname(server, addr_info->ai_addr, (int*)&addr_info->ai_addrlen))
+ goto fail;
+
+ client = socket(addr_info->ai_family, addr_info->ai_socktype, addr_info->ai_protocol);
+ if (INVALID_SOCKET == client)
+ goto fail;
+
+ memset(&addr,0,sizeof(addr));
+ addr.ai_family = addr_info->ai_family;
+ addr.ai_socktype = addr_info->ai_socktype;
+ addr.ai_protocol = addr_info->ai_protocol;
+
+ if (AF_INET6==addr.ai_family)
+ address = "0:0:0:0:0:0:0:1";
+ else
+ address = "127.0.0.1";
+
+ if (getaddrinfo(address, "0", &addr, &result))
+ goto fail;
+
+ setsockopt(client,SOL_SOCKET,SO_REUSEADDR,(const char*)&opt, sizeof(opt));
+ if(SOCKET_ERROR == bind(client, result->ai_addr, result->ai_addrlen))
+ goto fail;
+
+ if (SOCKET_ERROR == getsockname(client, result->ai_addr, (int*)&result->ai_addrlen))
+ goto fail;
+
+ if (SOCKET_ERROR == connect(server, result->ai_addr, result->ai_addrlen))
+ goto fail;
+
+ if (SOCKET_ERROR == connect(client, addr_info->ai_addr, addr_info->ai_addrlen))
+ goto fail;
+
+ freeaddrinfo(result);
+ sock[0] = client;
+ sock[1] = server;
+ return 0;
+
+fail:
+ if (INVALID_SOCKET!=client)
+ closesocket(client);
+ if (INVALID_SOCKET!=server)
+ closesocket(server);
+ if (result)
+ freeaddrinfo(result);
+ return -1;
+}
+
+int qemu_socketpair(int family, int type, int protocol,int recv[2]){
+ const char* address;
+ struct addrinfo addr_info,*p_addrinfo;
+ int result = -1;
+
+ if (family == AF_UNIX)
+ {
+ family = AF_INET;
+ }
+
+ memset(&addr_info, 0, sizeof(addr_info));
+ addr_info.ai_family = family;
+ addr_info.ai_socktype = type;
+ addr_info.ai_protocol = protocol;
+ if (AF_INET6==family)
+ address = "0:0:0:0:0:0:0:1";
+ else
+ address = "127.0.0.1";
+
+ if (0 == getaddrinfo(address, "0", &addr_info, &p_addrinfo)){
+ if (SOCK_STREAM == type)
+ result = __stream_socketpair(p_addrinfo, recv);
+ else if(SOCK_DGRAM == type)
+ result = __dgram_socketpair(p_addrinfo, recv);
+ freeaddrinfo(p_addrinfo);
+ }
+ return result;
+}
+
+#else
+
+int qemu_socketpair(int family, int type, int protocol,int recv[2]) {
+ return socketpair(family, type, protocol, recv);
+}
+
+#endif
+
#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
diff --git a/tests/crypto-tls-x509-helpers.h b/tests/crypto-tls-x509-helpers.h
index 08efba4e19..75a902278c 100644
--- a/tests/crypto-tls-x509-helpers.h
+++ b/tests/crypto-tls-x509-helpers.h
@@ -24,8 +24,9 @@
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-#if !(defined WIN32) && \
- defined(CONFIG_TASN1)
+#include "qemu/osdep.h"
+
+#if defined(CONFIG_TASN1)
# define QCRYPTO_HAVE_TLS_TEST_SUPPORT
#endif
@@ -127,6 +128,10 @@ void test_tls_cleanup(const char *keyfile);
extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];
+int qemu_link(const char *exist_path1, const char *new_path2);
+
+int qemu_socketpair(int family, int type, int protocol,int recv[2]);
+
#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */
#endif
diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c
index f487349c32..620fbde1ca 100644
--- a/tests/test-crypto-tlscredsx509.c
+++ b/tests/test-crypto-tlscredsx509.c
@@ -25,6 +25,9 @@
#include "qapi/error.h"
#include "qemu/module.h"
+#include <glib.h>
+#include <glib/gstdio.h>
+
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
#define WORKDIR "tests/test-crypto-tlscredsx509-work/"
@@ -77,34 +80,34 @@ static void test_tls_creds(const void *opaque)
QCryptoTLSCreds *creds;
#define CERT_DIR "tests/test-crypto-tlscredsx509-certs/"
- mkdir(CERT_DIR, 0700);
+ g_mkdir_with_parents(CERT_DIR, 0700);
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove (CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
if (data->isServer) {
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
+ g_remove (CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
+ g_remove (CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
} else {
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+ g_remove (CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+ g_remove (CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
}
- if (access(data->cacrt, R_OK) == 0) {
- g_assert(link(data->cacrt,
+ if (g_access(data->cacrt, R_OK) == 0) {
+ g_assert(qemu_link(data->cacrt,
CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT) == 0);
}
if (data->isServer) {
- if (access(data->crt, R_OK) == 0) {
- g_assert(link(data->crt,
+ if (g_access(data->crt, R_OK) == 0) {
+ g_assert(qemu_link(data->crt,
CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT) == 0);
}
- g_assert(link(KEYFILE,
+ g_assert(qemu_link(KEYFILE,
CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY) == 0);
} else {
- if (access(data->crt, R_OK) == 0) {
- g_assert(link(data->crt,
+ if (g_access(data->crt, R_OK) == 0) {
+ g_assert(qemu_link(data->crt,
CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT) == 0);
}
- g_assert(link(KEYFILE,
+ g_assert(qemu_link(KEYFILE,
CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY) == 0);
}
@@ -121,15 +124,15 @@ static void test_tls_creds(const void *opaque)
g_assert(creds != NULL);
}
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
if (data->isServer) {
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
+ g_remove(CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
+ g_remove(CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
} else {
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
- unlink(CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+ g_remove(CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+ g_remove(CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
}
- rmdir(CERT_DIR);
+ g_rmdir(CERT_DIR);
if (creds) {
object_unparent(OBJECT(creds));
}
@@ -143,7 +146,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1);
- mkdir(WORKDIR, 0700);
+ g_mkdir_with_parents(WORKDIR, 0700);
test_tls_init(KEYFILE);
@@ -699,7 +702,7 @@ int main(int argc, char **argv)
test_tls_discard_cert(&cacertlevel2areq);
test_tls_discard_cert(&servercertlevel3areq);
test_tls_discard_cert(&clientcertlevel2breq);
- unlink(WORKDIR "cacertchain-ctx.pem");
+ g_remove(WORKDIR "cacertchain-ctx.pem");
test_tls_cleanup(KEYFILE);
rmdir(WORKDIR);
diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c
index 8b2453fa79..f726219593 100644
--- a/tests/test-crypto-tlssession.c
+++ b/tests/test-crypto-tlssession.c
@@ -28,9 +28,13 @@
#include "qom/object_interfaces.h"
#include "qapi/error.h"
#include "qemu/module.h"
+#include "qemu/main-loop.h"
#include "qemu/sockets.h"
#include "authz/list.h"
+#include <glib.h>
+#include <glib/gstdio.h>
+
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
#define WORKDIR "tests/test-crypto-tlssession-work/"
@@ -40,15 +44,16 @@
static ssize_t testWrite(const char *buf, size_t len, void *opaque)
{
int *fd = opaque;
-
- return write(*fd, buf, len);
+ int written = send(*fd, buf, len, 0);
+ return written;
}
static ssize_t testRead(char *buf, size_t len, void *opaque)
{
int *fd = opaque;
- return read(*fd, buf, len);
+ int readed = recv(*fd, buf, len, 0);
+ return readed;
}
static QCryptoTLSCreds *test_tls_creds_psk_create(
@@ -84,7 +89,7 @@ static void test_crypto_tls_session_psk(void)
int ret;
/* We'll use this for our fake client-server connection */
- ret = socketpair(AF_UNIX, SOCK_STREAM, 0, channel);
+ ret = qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel);
g_assert(ret == 0);
/*
@@ -238,7 +243,7 @@ static void test_crypto_tls_session_x509(const void *opaque)
int ret;
/* We'll use this for our fake client-server connection */
- ret = socketpair(AF_UNIX, SOCK_STREAM, 0, channel);
+ ret = qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel);
g_assert(ret == 0);
/*
@@ -251,29 +256,29 @@ static void test_crypto_tls_session_x509(const void *opaque)
#define CLIENT_CERT_DIR "tests/test-crypto-tlssession-client/"
#define SERVER_CERT_DIR "tests/test-crypto-tlssession-server/"
- mkdir(CLIENT_CERT_DIR, 0700);
- mkdir(SERVER_CERT_DIR, 0700);
+ g_mkdir_with_parents(CLIENT_CERT_DIR, 0700);
+ g_mkdir_with_parents(SERVER_CERT_DIR, 0700);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
- g_assert(link(data->servercacrt,
+ g_assert(qemu_link(data->servercacrt,
SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT) == 0);
- g_assert(link(data->servercrt,
+ g_assert(qemu_link(data->servercrt,
SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT) == 0);
- g_assert(link(KEYFILE,
+ g_assert(qemu_link(KEYFILE,
SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY) == 0);
- g_assert(link(data->clientcacrt,
+ g_assert(qemu_link(data->clientcacrt,
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT) == 0);
- g_assert(link(data->clientcrt,
+ g_assert(qemu_link(data->clientcrt,
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT) == 0);
- g_assert(link(KEYFILE,
+ g_assert(qemu_link(KEYFILE,
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY) == 0);
clientCreds = test_tls_creds_x509_create(
@@ -369,16 +374,16 @@ static void test_crypto_tls_session_x509(const void *opaque)
g_assert(!data->expectClientFail);
}
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
- rmdir(CLIENT_CERT_DIR);
- rmdir(SERVER_CERT_DIR);
+ g_rmdir(CLIENT_CERT_DIR);
+ g_rmdir(SERVER_CERT_DIR);
object_unparent(OBJECT(serverCreds));
object_unparent(OBJECT(clientCreds));
@@ -397,10 +402,13 @@ int main(int argc, char **argv)
int ret;
module_call_init(MODULE_INIT_QOM);
+ qemu_init_main_loop(&error_abort);
+ socket_init();
+
g_test_init(&argc, &argv, NULL);
g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1);
- mkdir(WORKDIR, 0700);
+ g_mkdir_with_parents(WORKDIR, 0700);
test_tls_init(KEYFILE);
test_tls_psk_init(PSKFILE);
@@ -640,11 +648,11 @@ int main(int argc, char **argv)
test_tls_discard_cert(&cacertlevel2areq);
test_tls_discard_cert(&servercertlevel3areq);
test_tls_discard_cert(&clientcertlevel2breq);
- unlink(WORKDIR "cacertchain-sess.pem");
+ g_remove(WORKDIR "cacertchain-sess.pem");
test_tls_psk_cleanup(PSKFILE);
test_tls_cleanup(KEYFILE);
- rmdir(WORKDIR);
+ g_rmdir(WORKDIR);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
index ad7554c534..e858716192 100644
--- a/tests/test-io-channel-tls.c
+++ b/tests/test-io-channel-tls.c
@@ -31,9 +31,13 @@
#include "crypto/tlscredsx509.h"
#include "qapi/error.h"
#include "qemu/module.h"
+#include "qemu/main-loop.h"
#include "authz/list.h"
#include "qom/object_interfaces.h"
+#include <glib.h>
+#include <glib/gstdio.h>
+
#ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
#define WORKDIR "tests/test-io-channel-tls-work/"
@@ -123,33 +127,33 @@ static void test_io_channel_tls(const void *opaque)
GMainContext *mainloop;
/* We'll use this for our fake client-server connection */
- g_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0);
+ g_assert(qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0);
#define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/"
#define SERVER_CERT_DIR "tests/test-io-channel-tls-server/"
- mkdir(CLIENT_CERT_DIR, 0700);
- mkdir(SERVER_CERT_DIR, 0700);
+ g_mkdir(CLIENT_CERT_DIR, 0700);
+ g_mkdir(SERVER_CERT_DIR, 0700);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
- g_assert(link(data->servercacrt,
+ g_assert(qemu_link(data->servercacrt,
SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT) == 0);
- g_assert(link(data->servercrt,
+ g_assert(qemu_link(data->servercrt,
SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT) == 0);
- g_assert(link(KEYFILE,
+ g_assert(qemu_link(KEYFILE,
SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY) == 0);
- g_assert(link(data->clientcacrt,
+ g_assert(qemu_link(data->clientcacrt,
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT) == 0);
- g_assert(link(data->clientcrt,
+ g_assert(qemu_link(data->clientcrt,
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT) == 0);
- g_assert(link(KEYFILE,
+ g_assert(qemu_link(KEYFILE,
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY) == 0);
clientCreds = test_tls_creds_create(
@@ -238,13 +242,13 @@ static void test_io_channel_tls(const void *opaque)
QIO_CHANNEL(serverChanTLS));
qio_channel_test_validate(test);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
- unlink(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_CERT);
+ g_remove(SERVER_CERT_DIR QCRYPTO_TLS_CREDS_X509_SERVER_KEY);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
- unlink(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CA_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+ g_remove(CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
rmdir(CLIENT_CERT_DIR);
rmdir(SERVER_CERT_DIR);
@@ -272,10 +276,13 @@ int main(int argc, char **argv)
g_assert(qcrypto_init(NULL) == 0);
module_call_init(MODULE_INIT_QOM);
+ qemu_init_main_loop(&error_abort);
+ socket_init();
+
g_test_init(&argc, &argv, NULL);
g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1);
- mkdir(WORKDIR, 0700);
+ g_mkdir(WORKDIR, 0700);
test_tls_init(KEYFILE);
--
2.28.0.windows.1
next prev parent reply other threads:[~2020-09-12 22:54 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-12 22:44 [PATCH v8 00/27] W32, W64 msys2/mingw patches Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 01/27] rcu: Implement drain_call_rcu Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 02/27] block: Fixes nfs compiling error on msys2/mingw Yonggang Luo
2020-09-13 15:47 ` Philippe Mathieu-Daudé
2020-09-13 16:00 ` 罗勇刚(Yonggang Luo)
2020-09-13 18:58 ` Philippe Mathieu-Daudé
2020-09-14 10:26 ` 罗勇刚(Yonggang Luo)
2020-09-12 22:44 ` [PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-14 7:10 ` Thomas Huth
2020-09-14 7:15 ` 罗勇刚(Yonggang Luo)
2020-09-12 22:44 ` [PATCH v8 04/27] configure: Fixes ncursesw detection under msys2/mingw and enable curses Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 05/27] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 06/27] curses: Fixes curses compiling errors Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 07/27] tests: disable /char/stdio/* tests in test-char.c on win32 Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw Yonggang Luo
2020-09-13 15:37 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` [PATCH v8 09/27] tests: test-replication disable /replication/secondary/* " Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 10/27] osdep: file locking functions are not available on Win32 Yonggang Luo
2020-09-13 15:36 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` [PATCH v8 11/27] meson: Use -b to ignore CR vs. CR-LF issues on Windows Yonggang Luo
2020-09-13 15:35 ` Philippe Mathieu-Daudé
2020-09-13 16:01 ` 罗勇刚(Yonggang Luo)
2020-09-13 18:49 ` Philippe Mathieu-Daudé
2020-09-14 14:41 ` Peter Maydell
2020-09-14 15:20 ` 罗勇刚(Yonggang Luo)
2020-09-14 14:01 ` Eric Blake
2020-09-12 22:44 ` [PATCH v8 12/27] gcrypt: test_tls_psk_init should write binary file instead text file Yonggang Luo
2020-09-13 15:31 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` Yonggang Luo [this message]
2020-09-14 7:23 ` [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw Thomas Huth
2020-09-14 8:19 ` 罗勇刚(Yonggang Luo)
2020-09-14 11:07 ` Thomas Huth
2020-09-14 15:58 ` 罗勇刚(Yonggang Luo)
2020-09-14 16:13 ` Daniel P. Berrangé
2020-09-14 18:31 ` 罗勇刚(Yonggang Luo)
2020-09-12 22:44 ` [PATCH v8 14/27] meson: remove empty else and duplicated gio deps Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 15/27] vmstate: Fixes test-vmstate.c on msys2/mingw Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 16/27] cirrus: Building freebsd in a single short Yonggang Luo
2020-09-14 7:27 ` Thomas Huth
2020-09-14 8:50 ` Philippe Mathieu-Daudé
2020-09-14 10:43 ` Thomas Huth
2020-09-12 22:44 ` [PATCH v8 17/27] tests: Convert g_free to g_autofree macro in test-logging.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 18/27] tests: Fixes test-io-channel-socket.c tests under msys2/mingw Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 19/27] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 20/27] tests: Fixes test-io-channel-file by mask only owner file state mask bits Yonggang Luo
2020-09-13 15:28 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` [PATCH v8 21/27] tests: fix test-util-sockets.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 22/27] tests: Fixes test-qdev-global-props.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 23/27] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 24/27] ci: Enable msys2 ci in cirrus Yonggang Luo
2020-09-14 7:38 ` Thomas Huth
2020-09-14 8:25 ` Stefan Weil
2020-09-12 22:44 ` [PATCH v8 25/27] meson: upgrade meson for execute custom ninjatool under msys2 properly Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 26/27] meson: remove --ninja option in configure Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 27/27] Revert "configure: add --ninja option" Yonggang Luo
2020-09-13 14:08 ` Paolo Bonzini
2020-09-13 16:03 ` 罗勇刚(Yonggang Luo)
2020-09-13 16:12 ` Paolo Bonzini
2020-09-13 16:16 ` 罗勇刚(Yonggang Luo)
2020-09-13 16:14 ` 罗勇刚(Yonggang Luo)
2020-09-14 8:45 ` Paolo Bonzini
2020-09-14 8:48 ` 罗勇刚(Yonggang Luo)
2020-09-15 11:44 ` Thomas Huth
2020-09-15 11:56 ` 罗勇刚(Yonggang Luo)
2020-09-12 23:06 ` [PATCH v8 00/27] W32, W64 msys2/mingw patches no-reply
2020-09-14 7:00 ` 罗勇刚(Yonggang Luo)
2020-09-14 6:10 ` Thomas Huth
2020-09-14 6:27 ` 罗勇刚(Yonggang Luo)
2020-09-14 6:37 ` Stefan Weil
2020-09-14 6:54 ` 罗勇刚(Yonggang Luo)
2020-09-14 6:49 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200912224431.1428-14-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=armbru@redhat.com \
--cc=emaste@freebsd.org \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=lwhsu@freebsd.org \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).