From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 29 Aug 2017 16:04:52 +0000 (+0100)
Subject: io: fix check for handshake completion in TLS test
X-Git-Tag: qemu-xen-4.11.0-rc1~204^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=689ed13e73bdb5a5ca3366524475e3065fae854a;p=qemu-xen.git

io: fix check for handshake completion in TLS test

The TLS I/O channel test had mistakenly used && instead
of || when checking for handshake completion. As a
result it could terminate the handshake process before
it had actually completed. This was harmless before but
changes in GNUTLS 3.6.0 exposed this bug and caused the
test suite to fail.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
index ff96877323..a210d01ba5 100644
--- a/tests/test-io-channel-tls.c
+++ b/tests/test-io-channel-tls.c
@@ -218,7 +218,7 @@ static void test_io_channel_tls(const void *opaque)
     mainloop = g_main_context_default();
     do {
         g_main_context_iteration(mainloop, TRUE);
-    } while (!clientHandshake.finished &&
+    } while (!clientHandshake.finished ||
              !serverHandshake.finished);
 
     g_assert(clientHandshake.failed == data->expectClientFail);