mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 17:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611

Browse source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


vio/viosslfactories.c:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual merge
mysql-test/t/openssl_1.test:
  Manual merge
This commit is contained in:
unknown 2007-04-11 21:03:29 +02:00
commit 2b6cd45734
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
vio/viosslfactories.c
View file

@ -249,8 +249,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();