1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

respect client's desire to force ssl even when WITH_SSL=NO

Browse Source 
of course, this combination can never succeed,
we must fail to connect here.
This commit is contained in:
Sergei Golubchik 2017-04-19 20:31:05 +02:00
parent 4fe65ca33a
commit c6ee3fe9d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql-common/client.c
View File

@ -1815,8 +1815,8 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) ,
mysql->options.ssl_ca= set_ssl_option_unpack_path(ca); mysql->options.ssl_ca= set_ssl_option_unpack_path(ca);
mysql->options.ssl_capath= set_ssl_option_unpack_path(capath); mysql->options.ssl_capath= set_ssl_option_unpack_path(capath);
mysql->options.ssl_cipher= strdup_if_not_null(cipher); mysql->options.ssl_cipher= strdup_if_not_null(cipher);
mysql->options.use_ssl= TRUE;
#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
mysql->options.use_ssl= TRUE;
DBUG_RETURN(0); DBUG_RETURN(0);
} }
@ -2563,7 +2563,6 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
int3store(buff+2, net->max_packet_size); int3store(buff+2, net->max_packet_size);
end= buff+5; end= buff+5;
} }
#ifdef HAVE_OPENSSL
/* /*
If client uses ssl and client also has to verify the server If client uses ssl and client also has to verify the server
@ -2581,6 +2580,7 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
goto error; goto error;
} }
#ifdef HAVE_OPENSSL
if (mysql->client_flag & CLIENT_SSL) if (mysql->client_flag & CLIENT_SSL)
{ {
/* Do the SSL layering. */ /* Do the SSL layering. */