diff options
| author | Mayank Prasad <mayank.prasad@oracle.com> | 2011-03-11 17:01:19 +0530 |
|---|---|---|
| committer | Mayank Prasad <mayank.prasad@oracle.com> | 2011-03-11 17:01:19 +0530 |
| commit | b879731f1d27cfd096e828dd5d0e08037a57d215 (patch) | |
| tree | d4e7703e6768f27b31a89c2365fecb186b980e7d /extra | |
| parent | 258e3bfc3077a328c23d3e7b5c024dcefa431c87 (diff) | |
| parent | d2e36e4258bbcdbaf72c2dde02fa5039317f99ed (diff) | |
| download | mariadb-git-b879731f1d27cfd096e828dd5d0e08037a57d215.tar.gz | |
merge from mysql5.1 for bug#11760210
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/src/yassl_int.cpp | 2 |
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_; |