From 0ef1dcbe3a13878f4a2c22ea38d113e92424be70 Mon Sep 17 00:00:00 2001

Message-Id: <0ef1dcbe3a13878f4a2c22ea38d113e92424be70.1377873637.git.jdenemar@redhat.com>

From: "Daniel P. Berrange" <berrange@redhat.com>

Date: Tue, 13 Aug 2013 11:32:45 +0100

Subject: [PATCH] Split TLS test into two separate tests

For https://bugzilla.redhat.com/show_bug.cgi?id=994158

The virnettlscontexttest.c tests both virNetTLSContext

and virNetTLSSession functionality. Split into two

separate tests, to make the code size more manageable

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

(cherry picked from commit 236da82dae14a36cf373e3e7af622d9d6f40ecb8)

---

 cfg.mk                       |   2 +-

 tests/Makefile.am            |  17 +-

 tests/virnettlscontexttest.c | 787 +------------------------------------------

 tests/virnettlshelpers.c     | 420 +++++++++++++++++++++++

 tests/virnettlshelpers.h     |  79 +++++

 tests/virnettlssessiontest.c | 414 +++++++++++++++++++++++

 6 files changed, 945 insertions(+), 774 deletions(-)

 create mode 100644 tests/virnettlshelpers.c

 create mode 100644 tests/virnettlshelpers.h

 create mode 100644 tests/virnettlssessiontest.c

diff --git a/cfg.mk b/cfg.mk

index 13de268..c59d432 100644

--- a/cfg.mk

+++ b/cfg.mk

@@ -899,7 +899,7 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco

 exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$

 _src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|virfile)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon

-_test1=shunloadtest|virnettlscontexttest|vircgroupmock

+_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock

 exclude_file_name_regexp--sc_avoid_write = \

   ^(src/($(_src1))|daemon/libvirtd|tools/console|tests/($(_test1)))\.c$$

diff --git a/tests/Makefile.am b/tests/Makefile.am

index 5ea806e..efd28e3 100644

--- a/tests/Makefile.am

+++ b/tests/Makefile.am

@@ -134,7 +134,7 @@ test_programs += virdbustest \

 endif

 if WITH_GNUTLS

-test_programs += virnettlscontexttest

+test_programs += virnettlscontexttest virnettlssessiontest

 endif

 if WITH_SECDRIVER_SELINUX

@@ -592,17 +592,28 @@ virnetsockettest_LDADD = $(LDADDS)

 if WITH_GNUTLS

 virnettlscontexttest_SOURCES = \

-	virnettlscontexttest.c testutils.h testutils.c

+	virnettlscontexttest.c \

+	virnettlshelpers.h virnettlshelpers.c \

+	testutils.h testutils.c

 virnettlscontexttest_LDADD = $(LDADDS)

+virnettlssessiontest_SOURCES = \

+	virnettlssessiontest.c \

+	virnettlshelpers.h virnettlshelpers.c \

+	testutils.h testutils.c

+virnettlssessiontest_LDADD = $(LDADDS)

 if HAVE_LIBTASN1

 virnettlscontexttest_SOURCES += pkix_asn1_tab.c

 virnettlscontexttest_LDADD += -ltasn1

+virnettlssessiontest_SOURCES += pkix_asn1_tab.c

+virnettlssessiontest_LDADD += -ltasn1

 else

 EXTRA_DIST += pkix_asn1_tab.c

 endif

 else

 EXTRA_DIST += \

-	virnettlscontexttest.c testutils.h testutils.c pkix_asn1_tab.c

+	virnettlscontexttest.c virnettlssessiontest.c \

+	virnettlshelpers.h virnettlshelpers.c \

+	testutils.h testutils.c pkix_asn1_tab.c

 endif

 virtimetest_SOURCES = \

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c

index 908432b..0a0d31a 100644

--- a/tests/virnettlscontexttest.c

+++ b/tests/virnettlscontexttest.c

@@ -23,10 +23,9 @@

 #include <stdlib.h>

 #include <fcntl.h>

 #include <sys/socket.h>

-#include <gnutls/gnutls.h>

-#include <gnutls/x509.h>

 #include "testutils.h"

+#include "virnettlshelpers.h"

 #include "virutil.h"

 #include "virerror.h"

 #include "viralloc.h"

@@ -34,409 +33,13 @@

 #include "virfile.h"

 #include "vircommand.h"

 #include "virsocketaddr.h"

-#include "gnutls_1_0_compat.h"

 #if !defined WIN32 && HAVE_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600

-# include <libtasn1.h>

 # include "rpc/virnettlscontext.h"

 # define VIR_FROM_THIS VIR_FROM_RPC

-const char *keyfile = abs_builddir "/virnettlscontexttest-key.pem";

-

-/*

- * These store some static data that is needed when

- * encoding extensions in the x509 certs

- */

-ASN1_TYPE pkix_asn1;

-extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];

-

-/*

- * To avoid consuming random entropy to generate keys,

- * here's one we prepared earlier :-)

- */

-gnutls_x509_privkey_t privkey;

-# define PRIVATE_KEY                                              \

-    "-----BEGIN PRIVATE KEY-----\n"                               \

-    "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALVcr\n"     \

-    "BL40Tm6yq88FBhJNw1aaoCjmtg0l4dWQZ/e9Fimx4ARxFpT+ji4FE\n"     \

-    "Cgl9s/SGqC+1nvlkm9ViSo0j7MKDbnDB+VRHDvMAzQhA2X7e8M0n9\n"     \

-    "rPolUY2lIVC83q0BBaOBkCj2RSmT2xTEbbC2xLukSrg2WP/ihVOxc\n"     \

-    "kXRuyFtzAgMBAAECgYB7slBexDwXrtItAMIH6m/U+LUpNe0Xx48OL\n"     \

-    "IOn4a4whNgO/o84uIwygUK27ZGFZT0kAGAk8CdF9hA6ArcbQ62s1H\n"     \

-    "myxrUbF9/mrLsQw1NEqpuUk9Ay2Tx5U/wPx35S3W/X2AvR/ZpTnCn\n"     \

-    "2q/7ym9fyiSoj86drD7BTvmKXlOnOwQJBAPOFMp4mMa9NGpGuEssO\n"     \

-    "m3Uwbp6lhcP0cA9MK+iOmeANpoKWfBdk5O34VbmeXnGYWEkrnX+9J\n"     \

-    "bM4wVhnnBWtgBMCQQC+qAEmvwcfhauERKYznMVUVksyeuhxhCe7EK\n"     \

-    "mPh+U2+g0WwdKvGDgO0PPt1gq0ILEjspMDeMHVdTwkaVBo/uMhAkA\n"     \

-    "Z5SsZyCP2aTOPFDypXRdI4eqRcjaEPOUBq27r3uYb/jeboVb2weLa\n"     \

-    "L1MmVuHiIHoa5clswPdWVI2y0em2IGoDAkBPSp/v9VKJEZabk9Frd\n"     \

-    "a+7u4fanrM9QrEjY3KhduslSilXZZSxrWjjAJPyPiqFb3M8XXA26W\n"     \

-    "nz1KYGnqYKhLcBAkB7dt57n9xfrhDpuyVEv+Uv1D3VVAhZlsaZ5Pp\n"     \

-    "dcrhrkJn2sa/+O8OKvdrPSeeu/N5WwYhJf61+CPoenMp7IFci\n"         \

-    "-----END PRIVATE KEY-----\n"

-

-

-/*

- * This contains parameter about how to generate

- * certificates.

- */

-struct testTLSCertReq {

-    gnutls_x509_crt_t crt;

-    gnutls_x509_crt_t cacrt; /* If not set, then the cert will be self-signed */

-

-    const char *filename;

-

-    /* Identifying information */

-    const char *country;

-    const char *cn;

-    const char *altname1;

-    const char *altname2;

-    const char *ipaddr1;

-    const char *ipaddr2;

-

-    /* Basic constraints */

-    bool basicConstraintsEnable;

-    bool basicConstraintsCritical;

-    bool basicConstraintsIsCA;

-

-    /* Key usage */

-    bool keyUsageEnable;

-    bool keyUsageCritical;

-    int keyUsageValue;

-

-    /* Key purpose (aka Extended key usage) */

-    bool keyPurposeEnable;

-    bool keyPurposeCritical;

-    const char *keyPurposeOID1;

-    const char *keyPurposeOID2;

-

-    /* zero for current time, or non-zero for hours from now */

-    int start_offset;

-    /* zero for 24 hours from now, or non-zero for hours from now */

-    int expire_offset;

-};

-

-

-/*

- * Turns an ASN1 object into a DER encoded byte array

- */

-static void testTLSDerEncode(ASN1_TYPE src,

-                             const char *src_name,

-                             gnutls_datum_t * res)

-{

-  int size;

-  char *data = NULL;

-

-  size = 0;

-  asn1_der_coding(src, src_name, NULL, &size, NULL);

-

-  if (VIR_ALLOC_N(data, size) < 0)

-      abort();

-

-  asn1_der_coding(src, src_name, data, &size, NULL);

-

-  res->data = (unsigned char *)data;

-  res->size = size;

-}

-

-

-/*

- * This is a fairly lame x509 certificate generator.

- *

- * Do not copy/use this code for generating real certificates

- * since it leaves out many things that you would want in

- * certificates for real world usage.

- *

- * This is good enough only for doing tests of the libvirt

- * TLS certificate code

- */

-static void

-testTLSGenerateCert(struct testTLSCertReq *req)

-{

-    gnutls_x509_crt_t crt;

-    int err;

-    static char buffer[1024*1024];

-    size_t size = sizeof(buffer);

-    char serial[5] = { 1, 2, 3, 4, 0 };

-    gnutls_datum_t der;

-    time_t start = time(NULL) + (60*60*req->start_offset);

-    time_t expire = time(NULL) + (60*60*(req->expire_offset

-                                         ? req->expire_offset : 24));

-

-    /*

-     * Prepare our new certificate object

-     */

-    if ((err = gnutls_x509_crt_init(&crt)) < 0) {

-        VIR_WARN("Failed to initialize certificate %s", gnutls_strerror(err));

-        abort();

-    }

-    if ((err = gnutls_x509_crt_set_key(crt, privkey)) < 0) {

-        VIR_WARN("Failed to set certificate key %s", gnutls_strerror(err));

-        abort();

-    }

-

-    /*

-     * A v3 certificate is required in order to be able

-     * set any of the basic constraints, key purpose and

-     * key usage data

-     */

-    gnutls_x509_crt_set_version(crt, 3);

-

-    if (req->country) {

-        if ((err = gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COUNTRY_NAME, 0,

-                                                 req->country, strlen(req->country))) < 0) {

-            VIR_WARN("Failed to set certificate country name %s", gnutls_strerror(err));

-            abort();

-        }

-    }

-    if (req->cn) {

-        if ((err = gnutls_x509_crt_set_dn_by_oid(crt, GNUTLS_OID_X520_COMMON_NAME, 0,

-                                                 req->cn, strlen(req->cn))) < 0) {

-            VIR_WARN("Failed to set certificate common name %s", gnutls_strerror(err));

-            abort();

-        }

-    }

-

-    /*

-     * Setup the subject altnames, which are used

-     * for hostname checks in live sessions

-     */

-    if (req->altname1) {

-        if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_DNSNAME,

-                                                        req->altname1,

-                                                        strlen(req->altname1),

-                                                        GNUTLS_FSAN_APPEND))) {

-            VIR_WARN("Failed to set certificate alt name %s", gnutls_strerror(err));

-            abort();

-        }

-    }

-    if (req->altname2) {

-        if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_DNSNAME,

-                                                        req->altname2,

-                                                        strlen(req->altname2),

-                                                        GNUTLS_FSAN_APPEND))) {

-            VIR_WARN("Failed to set certificate %s alt name", gnutls_strerror(err));

-            abort();

-        }

-    }

-

-    /*

-     * IP address need to be put into the cert in their

-     * raw byte form, not strings, hence this is a little

-     * more complicated

-     */

-    if (req->ipaddr1) {

-        virSocketAddr addr;

-        char *data;

-        int len;

-        if (virSocketAddrParse(&addr, req->ipaddr1, 0) < 0) {

-            VIR_WARN("Cannot parse %s", req->ipaddr1);

-            abort();

-        }

-

-        if (addr.data.sa.sa_family == AF_INET) {

-            data = (char*)&addr.data.inet4.sin_addr;

-            len = 4;

-        } else {

-            data = (char*)&addr.data.inet6.sin6_addr;

-            len = 16;

-        }

-

-        if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_IPADDRESS,

-                                                        data, len, GNUTLS_FSAN_APPEND))) {

-            VIR_WARN("Failed to set certificate alt name %s", gnutls_strerror(err));

-            abort();

-        }

-    }

-    if (req->ipaddr2) {

-        virSocketAddr addr;

-        char *data;

-        int len;

-        if (virSocketAddrParse(&addr, req->ipaddr2, 0) < 0) {

-            VIR_WARN("Cannot parse %s", req->ipaddr2);

-            abort();

-        }

-

-        if (addr.data.sa.sa_family == AF_INET) {

-            data = (char*)&addr.data.inet4.sin_addr;

-            len = 4;

-        } else {

-            data = (char*)&addr.data.inet6.sin6_addr;

-            len = 16;

-        }

-

-        if ((err = gnutls_x509_crt_set_subject_alt_name(crt, GNUTLS_SAN_IPADDRESS,

-                                                        data, len, GNUTLS_FSAN_APPEND))) {

-            VIR_WARN("Failed to set certificate alt name %s", gnutls_strerror(err));

-            abort();

-        }

-    }

-

-

-    /*

-     * Basic constraints are used to decide if the cert

-     * is for a CA or not. We can't use the convenient

-     * gnutls API for setting this, since it hardcodes

-     * the 'critical' field which we want control over

-     */

-    if (req->basicConstraintsEnable) {

-        ASN1_TYPE ext = ASN1_TYPE_EMPTY;

-

-        asn1_create_element(pkix_asn1, "PKIX1.BasicConstraints", &ext;;

-        asn1_write_value(ext, "cA", req->basicConstraintsIsCA ? "TRUE" : "FALSE", 1);

-        asn1_write_value(ext, "pathLenConstraint", NULL, 0);

-        testTLSDerEncode(ext, "", &der;;

-        if ((err = gnutls_x509_crt_set_extension_by_oid(crt,

-                                                        "2.5.29.19",

-                                                        der.data,

-                                                        der.size,

-                                                        req->basicConstraintsCritical)) < 0) {

-            VIR_WARN("Failed to set certificate basic constraints %s", gnutls_strerror(err));

-            VIR_FREE(der.data);

-            abort();

-        }

-        asn1_delete_structure(&ext;;

-        VIR_FREE(der.data);

-    }

-

-    /*

-     * Next up the key usage extension. Again we can't

-     * use the gnutls API since it hardcodes the extension

-     * to be 'critical'

-     */

-    if (req->keyUsageEnable) {

-        ASN1_TYPE ext = ASN1_TYPE_EMPTY;

-        char str[2];

-

-        str[0] = req->keyUsageValue & 0xff;

-        str[1] = (req->keyUsageValue >> 8) & 0xff;

-

-        asn1_create_element(pkix_asn1, "PKIX1.KeyUsage", &ext;;

-        asn1_write_value(ext, "", str, 9);

-        testTLSDerEncode(ext, "", &der;;

-        if ((err = gnutls_x509_crt_set_extension_by_oid(crt,

-                                                        "2.5.29.15",

-                                                        der.data,

-                                                        der.size,

-                                                        req->keyUsageCritical)) < 0) {

-            VIR_WARN("Failed to set certificate key usage %s", gnutls_strerror(err));

-            VIR_FREE(der.data);

-            abort();

-        }

-        asn1_delete_structure(&ext;;

-        VIR_FREE(der.data);

-    }

-

-    /*

-     * Finally the key purpose extension. This time

-     * gnutls has the opposite problem, always hardcoding

-     * it to be non-critical. So once again we have to

-     * set this the hard way building up ASN1 data ourselves

-     */

-    if (req->keyPurposeEnable) {

-        ASN1_TYPE ext = ASN1_TYPE_EMPTY;

-

-        asn1_create_element(pkix_asn1, "PKIX1.ExtKeyUsageSyntax", &ext;;

-        if (req->keyPurposeOID1) {

-            asn1_write_value(ext, "", "NEW", 1);

-            asn1_write_value(ext, "?LAST", req->keyPurposeOID1, 1);

-        }

-        if (req->keyPurposeOID2) {

-            asn1_write_value(ext, "", "NEW", 1);

-            asn1_write_value(ext, "?LAST", req->keyPurposeOID2, 1);

-        }

-        testTLSDerEncode(ext, "", &der;;

-        if ((err = gnutls_x509_crt_set_extension_by_oid(crt,

-                                                        "2.5.29.37",

-                                                        der.data,

-                                                        der.size,

-                                                        req->keyPurposeCritical)) < 0) {

-            VIR_WARN("Failed to set certificate key purpose %s", gnutls_strerror(err));

-            VIR_FREE(der.data);

-            abort();

-        }

-        asn1_delete_structure(&ext;;

-        VIR_FREE(der.data);

-    }

-

-    /*

-     * Any old serial number will do, so lets pick 5

-     */

-    if ((err = gnutls_x509_crt_set_serial(crt, serial, 5)) < 0) {

-        VIR_WARN("Failed to set certificate serial %s", gnutls_strerror(err));

-        abort();

-    }

-

-    if ((err = gnutls_x509_crt_set_activation_time(crt, start)) < 0) {

-        VIR_WARN("Failed to set certificate activation %s", gnutls_strerror(err));

-        abort();

-    }

-    if ((err = gnutls_x509_crt_set_expiration_time(crt, expire)) < 0) {

-        VIR_WARN("Failed to set certificate expiration %s", gnutls_strerror(err));

-        abort();

-    }

-

-

-    /*

-     * If no 'cart' is set then we are self signing

-     * the cert. This is done for CA certs

-     */

-    if ((err = gnutls_x509_crt_sign(crt, req->cacrt ? req->cacrt : crt, privkey) < 0)) {

-        VIR_WARN("Failed to sign certificate %s", gnutls_strerror(err));

-        abort();

-    }

-

-    /*

-     * Finally write the new cert out to disk

-     */

-    if ((err = gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, buffer, &size) < 0)) {

-        VIR_WARN("Failed to export certificate %s", gnutls_strerror(err));

-        abort();

-    }

-

-    if (virFileWriteStr(req->filename, buffer, 0600) < 0) {

-        VIR_WARN("Failed to write certificate %s %s", req->filename, gnutls_strerror(err));

-        abort();

-    }

-

-    req->crt = crt;

-    return;

-}

-

-

-/*

- * This loads the private key we defined earlier

- */

-static gnutls_x509_privkey_t testTLSLoadKey(void)

-{

-    gnutls_x509_privkey_t key;

-    const gnutls_datum_t data = { (unsigned char *)PRIVATE_KEY, strlen(PRIVATE_KEY) };

-    int err;

-

-    if ((err = gnutls_x509_privkey_init(&key)) < 0) {

-        VIR_WARN("Failed to init key %s", gnutls_strerror(err));

-        abort();

-    }

-

-    if ((err = gnutls_x509_privkey_import(key, &data,

-                                          GNUTLS_X509_FMT_PEM)) < 0) {

-        if (err != GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR) {

-            VIR_WARN("Failed to import key %s", gnutls_strerror(err));

-            abort();

-        }

-

-        if ((err = gnutls_x509_privkey_import_pkcs8(key, &data, GNUTLS_X509_FMT_PEM, NULL, 0)) < 0) {

-            VIR_WARN("Failed to import PKCS8 key %s", gnutls_strerror(err));

-            abort();

-        }

-    }

-

-    return key;

-}

-

-

 struct testTLSContextData {

     bool isServer;

     struct testTLSCertReq careq;

@@ -500,257 +103,19 @@ static int testTLSContextInit(const void *opaque)

 cleanup:

     virObjectUnref(ctxt);

-    gnutls_x509_crt_deinit(data->careq.crt);

-    gnutls_x509_crt_deinit(data->certreq.crt);

-    data->careq.crt = data->certreq.crt = NULL;

-    /* When troubleshooting this tests, we often want to leave the certs on disk */

-    if (getenv("VIRT_TEST_DEBUG_CERTS") == NULL) {

-        unlink(data->careq.filename);

-        unlink(data->certreq.filename);

-    }

+    testTLSDiscardCert(&data->careq);

+    testTLSDiscardCert(&data->certreq);

     return ret;

 }

-struct testTLSSessionData {

-    struct testTLSCertReq careq;

-    struct testTLSCertReq othercareq;

-    struct testTLSCertReq serverreq;

-    struct testTLSCertReq clientreq;

-    bool expectServerFail;

-    bool expectClientFail;

-    const char *hostname;

-    const char *const* wildcards;

-};

-

-

-static ssize_t testWrite(const char *buf, size_t len, void *opaque)

-{

-    int *fd = opaque;

-

-    return write(*fd, buf, len);

-}

-

-static ssize_t testRead(char *buf, size_t len, void *opaque)

-{

-    int *fd = opaque;

-

-    return read(*fd, buf, len);

-}

-

-/*

- * This tests validation checking of peer certificates

- *

- * This is replicating the checks that are done for an

- * active TLS session after handshake completes. To

- * simulate that we create our TLS contexts, skipping

- * sanity checks. When then get a socketpair, and

- * initiate a TLS session across them. Finally do

- * do actual cert validation tests

- */

-static int testTLSSessionInit(const void *opaque)

-{

-    struct testTLSSessionData *data = (struct testTLSSessionData *)opaque;

-    virNetTLSContextPtr clientCtxt = NULL;

-    virNetTLSContextPtr serverCtxt = NULL;

-    virNetTLSSessionPtr clientSess = NULL;

-    virNetTLSSessionPtr serverSess = NULL;

-    int ret = -1;

-    int channel[2];

-    bool clientShake = false;

-    bool serverShake = false;

-

-

-    /* We'll use this for our fake client-server connection */

-    if (socketpair(AF_UNIX, SOCK_STREAM, 0, channel) < 0)

-        abort();

-

-    /*

-     * We have an evil loop to do the handshake in a single

-     * thread, so we need these non-blocking to avoid deadlock

-     * of ourselves

-     */

-    ignore_value(virSetNonBlock(channel[0]));

-    ignore_value(virSetNonBlock(channel[1]));

-

-

-    /* Generate all the certs we need for this test */

-    testTLSGenerateCert(&data->careq);

-    data->serverreq.cacrt = data->careq.crt;

-    testTLSGenerateCert(&data->serverreq);

-

-    if (data->othercareq.filename) {

-        testTLSGenerateCert(&data->othercareq);

-        data->clientreq.cacrt = data->othercareq.crt;

-    } else {

-        data->clientreq.cacrt = data->careq.crt;

-    }

-    testTLSGenerateCert(&data->clientreq);

-

-

-    /* We skip initial sanity checks here because we

-     * want to make sure that problems are being

-     * detected at the TLS session validation stage

-     */

-    serverCtxt = virNetTLSContextNewServer(data->careq.filename,

-                                           NULL,

-                                           data->serverreq.filename,

-                                           keyfile,

-                                           data->wildcards,

-                                           false,

-                                           true);

-

-    clientCtxt = virNetTLSContextNewClient(data->othercareq.filename ?

-                                           data->othercareq.filename :

-                                           data->careq.filename,

-                                           NULL,

-                                           data->clientreq.filename,

-                                           keyfile,

-                                           false,

-                                           true);

-

-    if (!serverCtxt) {

-        VIR_WARN("Unexpected failure loading %s against %s",

-                 data->careq.filename, data->serverreq.filename);

-        goto cleanup;

-    }

-    if (!clientCtxt) {

-        VIR_WARN("Unexpected failure loading %s against %s",

-                 data->othercareq.filename ? data->othercareq.filename :

-                 data->careq.filename, data->clientreq.filename);

-        goto cleanup;

-    }

-

-

-    /* Now the real part of the test, setup the sessions */

-    serverSess = virNetTLSSessionNew(serverCtxt, NULL);

-    clientSess = virNetTLSSessionNew(clientCtxt, data->hostname);

-

-    if (!serverSess) {

-        VIR_WARN("Unexpected failure using %s against %s",

-                 data->careq.filename, data->serverreq.filename);

-        goto cleanup;

-    }

-    if (!clientSess) {

-        VIR_WARN("Unexpected failure using %s against %s",

-                 data->othercareq.filename ? data->othercareq.filename :

-                 data->careq.filename, data->clientreq.filename);

-        goto cleanup;

-    }

-

-    /* For handshake to work, we need to set the I/O callbacks

-     * to read/write over the socketpair

-     */

-    virNetTLSSessionSetIOCallbacks(serverSess, testWrite, testRead, &channel[0]);

-    virNetTLSSessionSetIOCallbacks(clientSess, testWrite, testRead, &channel[1]);

-

-    /*

-     * Finally we loop around & around doing handshake on each

-     * session until we get an error, or the handshake completes.

-     * This relies on the socketpair being nonblocking to avoid

-     * deadlocking ourselves upon handshake

-     */

-    do {

-        int rv;

-        if (!serverShake) {

-            rv = virNetTLSSessionHandshake(serverSess);

-            if (rv < 0)

-                goto cleanup;

-            if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE)

-                serverShake = true;

-        }

-        if (!clientShake) {

-            rv = virNetTLSSessionHandshake(clientSess);

-            if (rv < 0)

-                goto cleanup;

-            if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE)

-                clientShake = true;

-        }

-    } while (!clientShake && !serverShake);

-

-

-    /* Finally make sure the server validation does what

-     * we were expecting

-     */

-    if (virNetTLSContextCheckCertificate(serverCtxt,

-                                         serverSess) < 0) {

-        if (!data->expectServerFail) {

-            VIR_WARN("Unexpected server cert check fail");

-            goto cleanup;

-        } else {

-            VIR_DEBUG("Got expected server cert fail");

-        }

-    } else {

-        if (data->expectServerFail) {

-            VIR_WARN("Expected server cert check fail");

-            goto cleanup;

-        } else {

-            VIR_DEBUG("Not unexpected server cert fail");

-        }

-    }

-

-    /*

-     * And the same for the client validation check

-     */

-    if (virNetTLSContextCheckCertificate(clientCtxt,

-                                         clientSess) < 0) {

-        if (!data->expectClientFail) {

-            VIR_WARN("Unexpected client cert check fail");

-            goto cleanup;

-        } else {

-            VIR_DEBUG("Got expected client cert fail");

-        }

-    } else {

-        if (data->expectClientFail) {