diff options
author | unknown <msvensson@pilot.blaudden> | 2007-04-11 22:08:00 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-04-11 22:08:00 +0200 |
commit | 48098cddb121136b456c3392bdb8f470559942ac (patch) | |
tree | 0354d286782236689632c88acc5bf22d96be0222 /vio | |
parent | 0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd (diff) | |
parent | d25a540dca1814d5a905544a88d93f936bc61137 (diff) | |
download | mariadb-git-48098cddb121136b456c3392bdb8f470559942ac.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
sql/mysqld.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/r/openssl_1.result:
Manual merge
mysql-test/t/openssl_1.test:
Manual merge
Diffstat (limited to 'vio')
-rw-r--r-- | vio/viosslfactories.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index d318f1b0122..d26d4147c9f 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -257,8 +257,13 @@ new_VioSSLFd(const char *key_file, const char *cert_file, DBUG_RETURN(0); } - /* Set the ciphers that can be used */ - if (cipher && SSL_CTX_set_cipher_list(ssl_fd->ssl_context, cipher)) + /* + Set the ciphers that can be used + NOTE: SSL_CTX_set_cipher_list will return 0 if + none of the provided ciphers could be selected + */ + if (cipher && + SSL_CTX_set_cipher_list(ssl_fd->ssl_context, cipher) == 0) { DBUG_PRINT("error", ("failed to set ciphers to use")); report_errors(); |