From: Mayank Prasad
Date: March 11 2011 10:46am
Subject: bzr commit into mysql-5.1 branch (mayank.prasad:3613) Bug#11760210
List-Archive: http://lists.mysql.com/commits/132805
X-Bug: 11760210
Message-Id: <201103111046.p2B5BA1e015000@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0391711834=="

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

#At file:///home/mayank/mysql-server/mysql-5.1_SSL/ based on revid:mattias.jonsson@stripped

 3613 Mayank Prasad	2011-03-11
      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-11 10:46:34 +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-11 10:46:34 +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-11 10:46:34 +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-11 10:46:34 +0000
@@ -0,0 +1,23 @@
+# 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.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


--===============0391711834==
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\
#   2zks6i8mmt2vzk0z
# target_branch: file:///home/mayank/mysql-server/mysql-5.1_SSL/
# testament_sha1: 95702c9e278617026401850282c255ee08ee4ba3
# timestamp: 2011-03-11 16:16:45 +0530
# base_revision_id: mattias.jonsson@stripped\
#   3vgir6mxnrhv175w
# 
# Begin bundle
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


--===============0391711834==--