tests: fix TLS handshake failure with TLS 1.3

When gnutls negotiates TLS 1.3 instead of 1.2, the order of messages
sent by the handshake changes. This exposed a logic bug in the test
suite which caused us to wait for the server to see handshake
completion, but not wait for the client to see completion. The result
was the client didn't receive the certificate for verification and the
test failed.

This is exposed in Fedora 29 rawhide which has just enabled TLS 1.3 in
its GNUTLS builds.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-07-18 10:24:59 +01:00
parent 68db13183f
commit db0a8c70f2
1 changed files with 2 additions and 2 deletions

View File

@ -151,7 +151,7 @@ static void test_crypto_tls_session_psk(void)
clientShake = true;
}
}
} while (!clientShake && !serverShake);
} while (!clientShake || !serverShake);
/* Finally make sure the server & client validation is successful. */
@ -341,7 +341,7 @@ static void test_crypto_tls_session_x509(const void *opaque)
clientShake = true;
}
}
} while (!clientShake && !serverShake);
} while (!clientShake || !serverShake);
/* Finally make sure the server validation does what