From: Mayank Prasad
Date: March 10 2011 1:09pm
Subject: [Resend] bzr commit into mysql-5.5 branch (mayank.prasad:3368) Bug#11760210
List-Archive: http://lists.mysql.com/commits/132756
X-Bug: 11760210
Message-Id: <201103101309.p2ACIseo003439@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0584460578=="

--===============0584460578==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

[This commit e-mail is a repeat.]

#At file:///home/mayank/mysql-server/mysql-ssl/ based on revid:alexander.barkov@stripped

 3368 Mayank Prasad	2011-03-10
      BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
      
      Issue:
      SSL_CIPHER set to a specific CIPHER name was not getting picked up by SHOW STATUS Command.
      
      Solution:
      If specific cipher name is specified, avoid overwriting of Cipher List with default Cipher names.
     @ extra/yassl/src/yassl_int.cpp
        If user specified Cipher name is there, avoid populating default cipher names' list.
     @ mysql-test/r/ssl_cipher.result
        Expected file for ssl_cipher.test test case
     @ mysql-test/t/ssl_cipher-master.opt
        Server option file for ssl_cipher.test test case.
     @ mysql-test/t/ssl_cipher.test
        Test case to verify that user specified SSL cipher name is shown in SHOW STATUS Command.

    added:
      mysql-test/r/ssl_cipher.result
      mysql-test/t/ssl_cipher-master.opt
      mysql-test/t/ssl_cipher.test
    modified:
      extra/yassl/src/yassl_int.cpp
=== modified file 'extra/yassl/src/yassl_int.cpp'
--- a/extra/yassl/src/yassl_int.cpp	2009-09-23 13:21:29 +0000
+++ b/extra/yassl/src/yassl_int.cpp	2011-03-10 13:08:39 +0000
@@ -308,7 +308,7 @@ SSL::SSL(SSL_CTX* ctx) 
             SetError(YasslError(err));
             return;
         }
-        else if (serverSide) {
+        else if (serverSide && !(ctx->GetCiphers().setSuites_)) {
             // remove RSA or DSA suites depending on cert key type
             ProtocolVersion pv = secure_.get_connection().version_;
             

=== added file 'mysql-test/r/ssl_cipher.result'
--- a/mysql-test/r/ssl_cipher.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/ssl_cipher.result	2011-03-10 13:08:39 +0000
@@ -0,0 +1,9 @@
+#
+# BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
+#
+SHOW STATUS LIKE 'Ssl_cipher';
+Variable_name	Value
+Ssl_cipher	AES128-SHA
+SHOW STATUS LIKE 'Ssl_cipher_list';
+Variable_name	Value
+Ssl_cipher_list	AES128-SHA

=== added file 'mysql-test/t/ssl_cipher-master.opt'
--- a/mysql-test/t/ssl_cipher-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/ssl_cipher-master.opt	2011-03-10 13:08:39 +0000
@@ -0,0 +1 @@
+--ssl-cipher=AES128-SHA

=== added file 'mysql-test/t/ssl_cipher.test'
--- a/mysql-test/t/ssl_cipher.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/ssl_cipher.test	2011-03-10 13:08:39 +0000
@@ -0,0 +1,26 @@
+# Turn on ssl between the client and server
+# and run a number of tests
+
+--echo #
+--echo # BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
+--echo #
+
+-- source include/have_ssl_communication.inc
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+connect (ssl_con,localhost,root,,,,,SSL);
+
+# Check Cipher Name and Cipher List
+SHOW STATUS LIKE 'Ssl_cipher';
+SHOW STATUS LIKE 'Ssl_cipher_list';
+
+connection default;
+disconnect ssl_con;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
+
+##  This test file is for testing encrypted communication only, not other
+##  encryption routines that the SSL library happens to provide!


--===============0584460578==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mayank.prasad@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mayank.prasad@stripped\
#   i1fgikgoqy1qro5u
# target_branch: file:///home/mayank/mysql-server/mysql-ssl/
# testament_sha1: 17619479660be2328124d83b40bd979aa996cf8d
# timestamp: 2011-03-10 18:39:58 +0530
# base_revision_id: alexander.barkov@stripped\
#   7my9cadoq48gup0z
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd5tc9kAA9pfgGQweef//3/v
34C////4YAkhtnvuy0Ap9rhTevX0fT6fdn3ncz64897DEqehTYk9NBoGmptU/QmU9T9KPKDIxNDa
g8UAEkQjRoAmIo9TE01B6gAaAAAAAMiE9Io/VPU0abSHqeppoAGgAGgADQASIhJoDRJ6g0AAepk9
QPSZAAAaACKRNJk9UzQQyTTyRomnpkIw0AJgCMeqegSSI0CMSep5NMmptJpk01I8oBoPUMaRkAHd
0wcuLh1d6XTy0yK3Nh0D/IWYePP8ig6VpZgo7eMaFeSTk679OgyVMnxTE2pYobmB57EHBiStHWcT
uuJnkL2pn6C1oZ/gZzvk3EzeV+MZAMzIJHn9yHnQXGmeclYSTmWFsz1F0RJrXFo/Ee4omofIpF/A
WP9u2Zpd44ECTKhBk59D7WxgEPp57qljSlWLFkULS5oxBlctvR8JlAEua6bukAoprj++Uig2F72B
KG8EVQKqU528qEZuVqDxsAhnKqV1gJooHRuatr1w7KdrZzunhPoyqezuA1Qv195AekLEALalUEyJ
rDbVi1G3QE4l3tY14+Xdr109VVgR1KIabpdTupslKUSlyO4LEIBo8r1b73u07zovMT0g5p6esQXj
bMqAm7ZOil5NRRJBaHgESOx7ESLUJkZQcl0ByrFwn4Yu9bOzEfayx1ZigDu7HHiHDALiwU8ib8mb
CJZzE3uuNleQrLFuLsQ0k2hlINZdZ1naw5cuC0nErGrNrgeD4k0PHANAGmsw+OSMQF7ajKAj0rCd
seOMW5bSBX6qSz5iZ0wyuqgUlitUDzY2tdGOoDFYmGJSErJgWQLTPbSCW3JZ1Mruu9iDCGRtpaW9
LbFgnf0TewaGzpYnU/y/M3ekF8SvyqHWUF5VydXgsZQQhjQKEgrLFyxLMh7cJrQa7zVuUBbR5Zr/
ewuKzms1nWvkL518betuaCvUJuoBxcXJ1QZxiZK1gnsNrrL0raZZxSmbXdxUzItUysmTPK1UR779
bFFY66rV6kFRkPfnt0jSQYrY5HnurJlxO80GlQbSxWzPGo7VuY42lZ1U3OwFG+03CRjfB42keRp2
695mcGDrntViyMuDmYl4w5E37tXZaK+o5EyJVYrDHDpvykaq+80fQK54GTRCrNcD1dagVbdZKct6
rU981q1X2PVCcMCdlHnYPfuntLhzindZSmz2cZdDEJW9fJbgClbXow12VKyAUJmBQYgazpVOlSxi
3jF2j3LA71/3jhHGlkETlnQamtDszmBdV2mGhopWlYqKQizhFptOeZKWJumj1hw8UXurNCYaAaxP
GZhuW/3hn3KCFf915/mciDJg22xsZ3dJ7HyJMW8yVypXfpZQPgul/xre9T8qPUBCHtX8AQOe6Ny0
b10DJZFKsg3MODghcBPqHSSczIYQhk8bBscoZBJn4nJ5XGMhMOxQoRBxXNXIyBk6kLrzpeMHrlS9
Cnv1rqHwqOwO3mCQTSF0ME8XokJWkLixl1hFTacJa88FDiZY9N7ybtx7T3WAMi8w0ekx+pgrkKJi
X7e/2O9o5Gs+H9HEdECcG9R+R8H2i9fJTUpU0t+eBcG9ap5mKkXhG204X0u3u3YG39ToXOQlN3oe
iiUVxpOAxYu09nAoPRe4lKjq5XaThww8YPLOawXxrzUhYRwYCbALw2BgMg4PHZbNoS2jRHK9OA85
UwB9zCpivgdjgCSVaV2IDCKdmGvvZn+kETLVcFBv0iDwd0XjjnkBxylOh2Gc7BsmiMTCmXhOJ+FJ
sJEE6FzXqKSBJA2KIkLlOnZo0PsYwNM+at8QFeS5NDLBqvl7oHRgrNB6EAOCAJeGzj7zBdUB8sqj
ki7Vt+SYiLTkWShWHM8mVxSBMkx1xBbmabdS2ojyHMaMRjDm+oig1b+HHEfHvtbZGsinYbJsWxpd
/jbzd1WZiyTCvcyDaOgPDUrUOBOtfNWGFpkMc7XTewMWaEVXHRJS1nRTlfX7GntKyVFIg5759Eh5
s2a8DwO5xy3tktxA70PIyhEwJkf6Gar6AwOCGA5D51wTpYw5lidStbIJqgWR4q4HUc7xaoDs5me0
StDv2snR8ZzgFiA5av8NaueivJYAUZNOCuHNLaax7VZnkpWEcdL5VNPdzRqRp4go5AQygfKmWKT+
qhwRUo8uGMnfIF7MzAVTlBJIkhYzEdaui+Tf94R8wo25ceeQCDf6ZZDDSLEL4MylCnW9psBdJLv6
VmwLsIeSMAecGFNcqf6xC0MLVteBOATuCNMBWcog2Q1Jz4NlP/GlwFarnUh33LcccE/kRgG07sEz
Loe5DBs46ilIwncSRudFdJEpIfwInnUQwWdhSZ35OubEWQdTqJicsNpTnbEsWHhCya0uN6doudtS
84WV0ENqQFzDKBoSebXmeJ7LnBst2Oz0NNrV/k6JoGwYXhWIBtD70wEq5cCKa861gtC6K/wBqSeo
OVmBfO1pUb1VrUHS7AoBlnIlDcwMIliREjZIaLqVcgCeX5k9PkqRlTYr0KuSLSHrYZphk3AadCw6
zxA2g77yC4QTYDlgE7kM2ExklTnPrkRyGDju45KaU09G+ltCMI5JsnK49oOboupoSaIi9TxI6hBn
CixK4IZkeuUihIWCcMCbZEpw3co9rA4M3hjQRq5qJYFlVyMw/sk52suZgWGAZWPHe9odR5aI7KWW
uoCl2l4qtvFFSYcwRF2FbhbtJjE2zf31KlivZZDhJwsIRspJavN36KHeTWSt98Tdz4WJhKlQs5fD
Q8BnGuEuvxlwWZ4AOXMPGl7TkLivRcC3VSeAh43BBGbO8OzCWp1ruruwwkzVULFNK1VmQ8IXQFTI
9xSdeZI9SxdmioTDR+XRZy2PsJAZqit3aWG2C6/BQfGvq64D9QYuSWmEjItMw3VuEsMBvNGtWUum
WfHnMj4PLiRE3JxtJzxSW6uEsPVvT8YqZWBXT0HaDNcY+xvy/8XckU4UJDebXPZA


--===============0584460578==--