diff options
author | unknown <msvensson@pilot.blaudden> | 2007-04-02 13:12:59 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-04-02 13:12:59 +0200 |
commit | 8033d64e136cb9519d527c59062dc3d0f17adcac (patch) | |
tree | b1092170c954d2f4a090dc42561b3e380071f299 /mysql-test/r/openssl_1.result | |
parent | 2bc57a692c228141a86d382019fad33a4a6ae9ea (diff) | |
download | mariadb-git-8033d64e136cb9519d527c59062dc3d0f17adcac.tar.gz |
Bug#21611 Slave can't connect when master-ssl-cipher specified
- Change check for return value of 'SSL_CTX_set_cipher_list'
in order to handle 0 as error setting cipher.
- Thanks to Dan Lukes for finding the problem!
mysql-test/r/openssl_1.result:
Update result
mysql-test/t/openssl_1.test:
Add test for setting ssl-cipher to be used
vio/viosslfactories.c:
Change error handling of SSL_CTX_set_cipher_list to
detect 0 as an error
Diffstat (limited to 'mysql-test/r/openssl_1.result')
-rw-r--r-- | mysql-test/r/openssl_1.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 34d8e3ab768..a80ef4fc4bb 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -51,3 +51,6 @@ SSL error: Unable to get private key from '' mysqltest: Could not open connection 'default': 2026 SSL connection error SSL error: Unable to get certificate from '' mysqltest: Could not open connection 'default': 2026 SSL connection error +SHOW STATUS LIKE 'Ssl_cipher'; +Variable_name Value +Ssl_cipher DHE-RSA-AES256-SHA |