summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMayank Prasad <mayank.prasad@oracle.com>2011-03-11 16:16:34 +0530
committerMayank Prasad <mayank.prasad@oracle.com>2011-03-11 16:16:34 +0530
commitd2e36e4258bbcdbaf72c2dde02fa5039317f99ed (patch)
tree6627343908d8c1e58e1032978da867475529f85b /extra
parentba85e3cf54980fa7b6e45f88e04b009166656c5f (diff)
downloadmariadb-git-d2e36e4258bbcdbaf72c2dde02fa5039317f99ed.tar.gz
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.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/src/yassl_int.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
index 8e4a9aa95ec..5af2f180bb1 100644
--- a/extra/yassl/src/yassl_int.cpp
+++ b/extra/yassl/src/yassl_int.cpp
@@ -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_;