enable TLSv1.0 in WolfSSL

MariaDB · Jun 17, 2019 · e46b87aaeda4ec7ae775fbd9b1f76e77f4e14590 · e46b87a
1 parent e79b900
commit e46b87aaeda4ec7ae775fbd9b1f76e77f4e14590
Unified Split

Showing with 22 additions and 1 deletion.

+1 −1 extra/wolfssl/user_settings.h.in

+1 −0 mysql-test/main/tls_version1.opt

+6 −0 mysql-test/main/tls_version1.result

+12 −0 mysql-test/main/tls_version1.test

+2 −0 mysql-test/suite.pm
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in
@@ -19,7 +19,7 @@
 #define WOLFSSL_AES_COUNTER
 #define NO_WOLFSSL_STUB
 #define OPENSSL_ALL
-  
-
+  
+#define WOLFSSL_ALLOW_TLSV10
 #cmakedefine WOLFSSL_AESNI
 #cmakedefine USE_FAST_MATH

diff --git a/mysql-test/main/tls_version1.opt b/mysql-test/main/tls_version1.opt
@@ -0,0 +1 @@
+  
+--tls_version=TLSv1.0
diff --git a/mysql-test/main/tls_version1.result b/mysql-test/main/tls_version1.result
@@ -0,0 +1,6 @@
+  
+Variable_name	Value
+  
+Ssl_version	TLSv1
+  
+Variable_name	Value
+  
+Ssl_version	TLSv1
+  
+@@tls_version
+  
+TLSv1.0
diff --git a/mysql-test/main/tls_version1.test b/mysql-test/main/tls_version1.test
@@ -0,0 +1,12 @@
+  
+# Tests for SSL connections, only run if mysqld is compiled
+  
+# with support for SSL.
+  
+
+  
+-- source include/have_ssl_communication.inc
+  
+--exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
+  
+--error 1
+  
+--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
+  
+--error 1
+  
+--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
+  
+--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
+  
+--exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"
+  
+
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
@@ -80,6 +80,8 @@ sub skip_combinations {
    $_=<$f>;
    $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf"
      if /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m;
+  
+    $skip{'main/tls_version1.test'} = "TLSv1.0 disabled in $openssl_cnf"
+  
+      if /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m;
  }
  %skip;