aboutsummaryrefslogtreecommitdiff
path: root/tests/test-crypto-tlssession.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-crypto-tlssession.c')
-rw-r--r--tests/test-crypto-tlssession.c76
1 files changed, 28 insertions, 48 deletions
diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c
index 7bd811796e..fd9acf9067 100644
--- a/tests/test-crypto-tlssession.c
+++ b/tests/test-crypto-tlssession.c
@@ -52,28 +52,21 @@ static ssize_t testRead(char *buf, size_t len, void *opaque)
static QCryptoTLSCreds *test_tls_creds_psk_create(
QCryptoTLSCredsEndpoint endpoint,
- const char *dir,
- Error **errp)
+ const char *dir)
{
- Error *err = NULL;
Object *parent = object_get_objects_root();
Object *creds = object_new_with_props(
TYPE_QCRYPTO_TLS_CREDS_PSK,
parent,
(endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER ?
"testtlscredsserver" : "testtlscredsclient"),
- &err,
+ &error_abort,
"endpoint", (endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER ?
"server" : "client"),
"dir", dir,
"priority", "NORMAL",
NULL
);
-
- if (err) {
- error_propagate(errp, err);
- return NULL;
- }
return QCRYPTO_TLS_CREDS(creds);
}
@@ -87,7 +80,6 @@ static void test_crypto_tls_session_psk(void)
int channel[2];
bool clientShake = false;
bool serverShake = false;
- Error *err = NULL;
int ret;
/* We'll use this for our fake client-server connection */
@@ -104,25 +96,23 @@ static void test_crypto_tls_session_psk(void)
clientCreds = test_tls_creds_psk_create(
QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT,
- WORKDIR,
- &err);
+ WORKDIR);
g_assert(clientCreds != NULL);
serverCreds = test_tls_creds_psk_create(
QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
- WORKDIR,
- &err);
+ WORKDIR);
g_assert(serverCreds != NULL);
/* Now the real part of the test, setup the sessions */
clientSess = qcrypto_tls_session_new(
clientCreds, NULL, NULL,
- QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, &err);
+ QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, &error_abort);
+ g_assert(clientSess != NULL);
+
serverSess = qcrypto_tls_session_new(
serverCreds, NULL, NULL,
- QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, &err);
-
- g_assert(clientSess != NULL);
+ QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, &error_abort);
g_assert(serverSess != NULL);
/* For handshake to work, we need to set the I/O callbacks
@@ -145,7 +135,7 @@ static void test_crypto_tls_session_psk(void)
int rv;
if (!serverShake) {
rv = qcrypto_tls_session_handshake(serverSess,
- &err);
+ &error_abort);
g_assert(rv >= 0);
if (qcrypto_tls_session_get_handshake_status(serverSess) ==
QCRYPTO_TLS_HANDSHAKE_COMPLETE) {
@@ -154,7 +144,7 @@ static void test_crypto_tls_session_psk(void)
}
if (!clientShake) {
rv = qcrypto_tls_session_handshake(clientSess,
- &err);
+ &error_abort);
g_assert(rv >= 0);
if (qcrypto_tls_session_get_handshake_status(clientSess) ==
QCRYPTO_TLS_HANDSHAKE_COMPLETE) {
@@ -165,8 +155,10 @@ static void test_crypto_tls_session_psk(void)
/* Finally make sure the server & client validation is successful. */
- g_assert(qcrypto_tls_session_check_credentials(serverSess, &err) == 0);
- g_assert(qcrypto_tls_session_check_credentials(clientSess, &err) == 0);
+ g_assert(qcrypto_tls_session_check_credentials(serverSess,
+ &error_abort) == 0);
+ g_assert(qcrypto_tls_session_check_credentials(clientSess,
+ &error_abort) == 0);
object_unparent(OBJECT(serverCreds));
object_unparent(OBJECT(clientCreds));
@@ -192,17 +184,15 @@ struct QCryptoTLSSessionTestData {
static QCryptoTLSCreds *test_tls_creds_x509_create(
QCryptoTLSCredsEndpoint endpoint,
- const char *certdir,
- Error **errp)
+ const char *certdir)
{
- Error *err = NULL;
Object *parent = object_get_objects_root();
Object *creds = object_new_with_props(
TYPE_QCRYPTO_TLS_CREDS_X509,
parent,
(endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER ?
"testtlscredsserver" : "testtlscredsclient"),
- &err,
+ &error_abort,
"endpoint", (endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER ?
"server" : "client"),
"dir", certdir,
@@ -217,11 +207,6 @@ static QCryptoTLSCreds *test_tls_creds_x509_create(
"sanity-check", "no",
NULL
);
-
- if (err) {
- error_propagate(errp, err);
- return NULL;
- }
return QCRYPTO_TLS_CREDS(creds);
}
@@ -249,7 +234,6 @@ static void test_crypto_tls_session_x509(const void *opaque)
int channel[2];
bool clientShake = false;
bool serverShake = false;
- Error *err = NULL;
int ret;
/* We'll use this for our fake client-server connection */
@@ -293,14 +277,12 @@ static void test_crypto_tls_session_x509(const void *opaque)
clientCreds = test_tls_creds_x509_create(
QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT,
- CLIENT_CERT_DIR,
- &err);
+ CLIENT_CERT_DIR);
g_assert(clientCreds != NULL);
serverCreds = test_tls_creds_x509_create(
QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
- SERVER_CERT_DIR,
- &err);
+ SERVER_CERT_DIR);
g_assert(serverCreds != NULL);
acl = qemu_acl_init("tlssessionacl");
@@ -314,13 +296,13 @@ static void test_crypto_tls_session_x509(const void *opaque)
/* Now the real part of the test, setup the sessions */
clientSess = qcrypto_tls_session_new(
clientCreds, data->hostname, NULL,
- QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, &err);
+ QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, &error_abort);
+ g_assert(clientSess != NULL);
+
serverSess = qcrypto_tls_session_new(
serverCreds, NULL,
data->wildcards ? "tlssessionacl" : NULL,
- QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, &err);
-
- g_assert(clientSess != NULL);
+ QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, &error_abort);
g_assert(serverSess != NULL);
/* For handshake to work, we need to set the I/O callbacks
@@ -343,7 +325,7 @@ static void test_crypto_tls_session_x509(const void *opaque)
int rv;
if (!serverShake) {
rv = qcrypto_tls_session_handshake(serverSess,
- &err);
+ &error_abort);
g_assert(rv >= 0);
if (qcrypto_tls_session_get_handshake_status(serverSess) ==
QCRYPTO_TLS_HANDSHAKE_COMPLETE) {
@@ -352,7 +334,7 @@ static void test_crypto_tls_session_x509(const void *opaque)
}
if (!clientShake) {
rv = qcrypto_tls_session_handshake(clientSess,
- &err);
+ &error_abort);
g_assert(rv >= 0);
if (qcrypto_tls_session_get_handshake_status(clientSess) ==
QCRYPTO_TLS_HANDSHAKE_COMPLETE) {
@@ -365,10 +347,9 @@ static void test_crypto_tls_session_x509(const void *opaque)
/* Finally make sure the server validation does what
* we were expecting
*/
- if (qcrypto_tls_session_check_credentials(serverSess, &err) < 0) {
+ if (qcrypto_tls_session_check_credentials(
+ serverSess, data->expectServerFail ? NULL : &error_abort) < 0) {
g_assert(data->expectServerFail);
- error_free(err);
- err = NULL;
} else {
g_assert(!data->expectServerFail);
}
@@ -376,10 +357,9 @@ static void test_crypto_tls_session_x509(const void *opaque)
/*
* And the same for the client validation check
*/
- if (qcrypto_tls_session_check_credentials(clientSess, &err) < 0) {
+ if (qcrypto_tls_session_check_credentials(
+ clientSess, data->expectClientFail ? NULL : &error_abort) < 0) {
g_assert(data->expectClientFail);
- error_free(err);
- err = NULL;
} else {
g_assert(!data->expectClientFail);
}
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-30 08:54:23 +0000