Merge lp:~laurynas-biveinis/percona-server/bug1401791-5.5 into lp:percona-server/5.5
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+244585@code.launchpad.net |
Description of the change
Fix bug 1401791 / http://
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
message:
Bug #18047796 MTR TEST MAIN.OPENSSL_1 FAILS ON FEDORA 19 WITH OPENSSL 1.0.1E
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-
Fix: We have replaced the cipher check "EDH-RSA-