From dbe3161b6dab7640f7705d68f36cbd84240e80d1 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Wed, 9 Jun 2021 12:34:23 +0200
Subject: [PATCH] Remove WolfSSL workaround for old version. We're already on
 4.4.6

---
 extra/wolfssl/user_settings.h.in | 2 +-
 mysql-test/suite.pm              | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in
index e381e87ce71..911c466372e 100644
--- a/extra/wolfssl/user_settings.h.in
+++ b/extra/wolfssl/user_settings.h.in
@@ -20,7 +20,7 @@
 #define WOLFSSL_AES_COUNTER
 #define NO_WOLFSSL_STUB
 #define OPENSSL_ALL
-#undef WOLFSSL_ALLOW_TLSV10 /* see https://github.com/wolfSSL/wolfssl/issues/2960 */
+#define WOLFSSL_ALLOW_TLSV10
 #define NO_OLD_TIMEVAL_NAME
 /*
   FP_MAX_BITS is set high solely to satisfy ssl_8k_key.test
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 8ff2e95c083..905c3460d46 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -74,8 +74,6 @@ sub skip_combinations {
   $skip{'main/ssl_verify_ip.test'} = 'x509v3 support required'
     unless $openssl_ver ge "1.0.2";
 
-  $skip{'main/tls_version1.test'} = 'https://github.com/wolfSSL/wolfssl/issues/2960'
-    if $ssl_lib =~ /WolfSSL 4.4.0/;
 
   %skip;
 }