From 255c4b09ad818454a6fa7cd34a39dc5a7cf417a1 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Fri, 11 May 2018 07:15:23 +0200 Subject: [PATCH] TLS/SSL test fixes: - create ssluser to prevent failing test on new db instance - skip tls_version test when using OpenSSL 1.1.1 --- unittest/libmariadb/ssl.c.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/unittest/libmariadb/ssl.c.in b/unittest/libmariadb/ssl.c.in index b4314a27..6dd4ed85 100644 --- a/unittest/libmariadb/ssl.c.in +++ b/unittest/libmariadb/ssl.c.in @@ -117,6 +117,8 @@ static int test_ssl(MYSQL *mysql) mysql_ssl_set(my,0, 0, 0, 0, 0); + create_ssl_user("ssluser", 0); + FAIL_IF(!mysql_real_connect(my, hostname, ssluser, sslpw, schema, port, socketname, 0), mysql_error(my)); @@ -1255,6 +1257,11 @@ static int test_mdev14101(MYSQL *my __attribute__((unused))) bool skip_tlsv12= !have_openssl; #endif +#if defined(HAVE_OPENSSL) && defined(TLS1_3_VERSION) + diag("Test fails with TLS v1.3"); + return(SKIP); +#endif + for (i=0; combinations[i].expected; i++) { MYSQL *mysql;