[mariadb-galera/f21] Fix openssl test

[Honza Horak]

commit 2eb25af75c23918838a35d656d4bb861500008c1
Author: Honza Horak <hhorak at redhat.com>
Date:   Tue Feb 10 12:34:02 2015 +0100

    Fix openssl test
    
    Conflicts:
    	mariadb-galera.spec

 mariadb-galera.spec        |  1 +
 mariadb-ssltest.patch      | 34 ++++++++++++++++++++++++++--------
 rh-skipped-tests-base.list |  1 -
 3 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index 4a1e51c..fcc3070 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -1239,6 +1239,7 @@ fi
 * Wed Mar 11 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-1
 - Rebase to version 10.0.17
 - Rework disabled tests handling
+- Fix openssl_1 test
 
 * Sat Jan 24 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-1
 - Rebase to version 10.0.15
diff --git a/mariadb-ssltest.patch b/mariadb-ssltest.patch
index 8409f39..c39b752 100644
--- a/mariadb-ssltest.patch
+++ b/mariadb-ssltest.patch
@@ -4,10 +4,10 @@ which now makes mariadb/mysql FTBFS because openssl_1 test fails
 Related: #1044565
 
 
-diff -up mariadb-10.0.10/mysql-test/r/openssl_1.result.p14 mariadb-10.0.10/mysql-test/r/openssl_1.result
---- mariadb-10.0.10/mysql-test/r/openssl_1.result.p14	2014-03-30 19:56:35.000000000 +0200
-+++ mariadb-10.0.10/mysql-test/r/openssl_1.result	2014-04-07 20:14:24.702980342 +0200
-@@ -196,8 +196,6 @@ Ssl_cipher	DHE-RSA-AES256-SHA
+diff -up mariadb-10.0.16/mysql-test/r/openssl_1.result.testssl mariadb-10.0.16/mysql-test/r/openssl_1.result
+--- mariadb-10.0.16/mysql-test/r/openssl_1.result.testssl	2015-01-25 16:21:38.000000000 +0100
++++ mariadb-10.0.16/mysql-test/r/openssl_1.result	2015-02-10 12:15:06.178207088 +0100
+@@ -198,8 +198,6 @@ Ssl_cipher	DHE-RSA-AES256-SHA
  Variable_name	Value
  Ssl_cipher	EDH-RSA-DES-CBC3-SHA
  Variable_name	Value
@@ -16,10 +16,19 @@ diff -up mariadb-10.0.10/mysql-test/r/openssl_1.result.p14 mariadb-10.0.10/mysql
  Ssl_cipher	RC4-SHA
  select 'is still running; no cipher request crashed the server' as result from dual;
  result
-diff -up mariadb-10.0.10/mysql-test/t/openssl_1.test.p14 mariadb-10.0.10/mysql-test/t/openssl_1.test
---- mariadb-10.0.10/mysql-test/t/openssl_1.test.p14	2014-04-07 20:14:24.686980712 +0200
-+++ mariadb-10.0.10/mysql-test/t/openssl_1.test	2014-04-07 20:14:24.702980342 +0200
-@@ -218,7 +218,7 @@ DROP TABLE t1;
+diff -up mariadb-10.0.16/mysql-test/t/openssl_1.test.testssl mariadb-10.0.16/mysql-test/t/openssl_1.test
+--- mariadb-10.0.16/mysql-test/t/openssl_1.test.testssl	2015-01-25 16:21:38.000000000 +0100
++++ mariadb-10.0.16/mysql-test/t/openssl_1.test	2015-02-10 12:16:49.769911038 +0100
+@@ -132,7 +132,7 @@ drop table t1;
+ # verification of servers certificate by setting both ca certificate
+ # and ca path to NULL
+ #
+---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ --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
+ --echo End of 5.0 tests
+ 
+@@ -222,7 +222,7 @@ DROP TABLE t1;
  # Common ciphers to openssl and yassl
  --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
  --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
@@ -28,3 +37,12 @@ diff -up mariadb-10.0.10/mysql-test/t/openssl_1.test.p14 mariadb-10.0.10/mysql-t
  --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
  --disable_query_log
  --disable_result_log
+@@ -259,7 +259,7 @@ select 'is still running; no cipher requ
+ GRANT SELECT ON test.* TO bug42158 at localhost REQUIRE X509;
+ FLUSH PRIVILEGES;
+ connect(con1,localhost,bug42158,,,,,SSL);
+---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ SHOW STATUS LIKE 'Ssl_cipher';
+ disconnect con1;
+ connection default;
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 794bea7..9ef7b4c 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -1,7 +1,6 @@
 # These tests fail with MariaDB 10:
 
 main.func_str                                : rhbz#1096787
-main.openssl_1                               : rhbz#1096787
 main.ssl                                     : rhbz#1096787
 main.ssl_compress                            : rhbz#1096787
 main.ssl_crl_clients                         : rhbz#1096787