22 lines
1.3 KiB
Diff
22 lines
1.3 KiB
Diff
|
diff -up mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak mariadb-10.1.19/mysql-test/r/ssl_8k_key.result
|
||
|
|
--- mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak 2016-11-24 08:55:21.637000000 -0500
|
||
|
|
+++ mariadb-10.1.19/mysql-test/r/ssl_8k_key.result 2016-11-24 08:55:55.853000000 -0500
|
||
|
|
@@ -1,2 +1,2 @@
|
||
|
|
-Variable_name Value
|
||
|
|
-Ssl_cipher DHE-RSA-AES256-SHA
|
||
|
|
+have_ssl
|
||
|
|
+1
|
||
|
|
diff -up mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak mariadb-10.1.19/mysql-test/t/ssl_8k_key.test
|
||
|
|
--- mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak 2016-11-24 08:54:10.485000000 -0500
|
||
|
|
+++ mariadb-10.1.19/mysql-test/t/ssl_8k_key.test 2016-11-24 08:54:35.724000000 -0500
|
||
|
|
@@ -5,7 +5,7 @@
|
||
|
|
#
|
||
|
|
# Bug#29784 YaSSL assertion failure when reading 8k key.
|
||
|
|
#
|
||
|
|
---exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
|
||
|
|
+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
|
||
|
|
|
||
|
|
## This test file is for testing encrypted communication only, not other
|
||
|
|
## encryption routines that the SSL library happens to provide!
|
||
|
|
|