Merge lp:~laurynas-biveinis/percona-server/bug1401791-5.5 into lp:percona-server/5.5

Proposed by Laurynas Biveinis on 2014-12-12
Status: Merged
Approved by: Laurynas Biveinis on 2014-12-12
Approved revision: 699
Merged at revision: 721
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1401791-5.5
Merge into: lp:percona-server/5.5
Diff against target: 25 lines (+2/-2)
2 files modified
mysql-test/r/openssl_1.result (+1/-1)
mysql-test/t/openssl_1.test (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1401791-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2014-12-12
Review via email:

Description of the change

Fix bug 1401791 / (openssl_1
tries to test a removed cipher on CentOS 7).

Instead of removed EDH-RSA-DES-CBC-SHA cipher, use AES256-SHA by
backporting upstream 5.6 rev 5747:

evno: 5747
committer: Venkata Sidagam <email address hidden>
branch nick: 5.6
timestamp: Sat 2014-01-11 17:27:44 +0530

  Description: mtr test main.openssl_1 fails on Fedora 19 x86_64, server is built against
  system openssl 1.0.1e-35.

  Analysis: The cipher "EDH-RSA-DES-CBC-SHA" is removed from the open_ssl since "openssl-1.0.1e-35" source. Mentioned that its a week cipher. Because of that the test case which is looking for the cipher is not finding in the cipher list.

  Fix: We have replaced the cipher check "EDH-RSA-DES-CBC-SHA" with another common "AES256-SHA" cipher in the test case.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/r/openssl_1.result'
2--- mysql-test/r/openssl_1.result 2013-09-06 07:08:11 +0000
3+++ mysql-test/r/openssl_1.result 2014-12-12 13:37:42 +0000
4@@ -196,7 +196,7 @@
5 Variable_name Value
6 Ssl_cipher EDH-RSA-DES-CBC3-SHA
7 Variable_name Value
8-Ssl_cipher EDH-RSA-DES-CBC-SHA
9+Ssl_cipher AES256-SHA
10 Variable_name Value
11 Ssl_cipher RC4-SHA
12 select 'is still running; no cipher request crashed the server' as result from dual;
14=== modified file 'mysql-test/t/openssl_1.test'
15--- mysql-test/t/openssl_1.test 2013-06-26 09:19:02 +0000
16+++ mysql-test/t/openssl_1.test 2014-12-12 13:37:42 +0000
17@@ -214,7 +214,7 @@
18 # Common ciphers to openssl and yassl
19 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
20 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
21---exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
22+--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=AES256-SHA
23 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
24 --disable_query_log
25 --disable_result_log


People subscribed via source and target branches