1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING SSL CONNECTION

MYSQL_OPT_SSL_MODE option introduced.
It is set in case of --ssl-mode=REQUIRED and permits only SSL connection.

(cherry picked from commit 3b2d28578c526f347f5cfe763681eff365731f99)
This commit is contained in:
Ramil Kalimullin
2017-03-10 01:19:50 +04:00
committed by Gipson Pulla
parent 19150f7e7a
commit 060b1eadf4
18 changed files with 134 additions and 55 deletions

View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -387,9 +387,11 @@ static int run_tool(char *tool_path, DYNAMIC_STRING *ds_res, ...)
va_end(args);
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
/* If given --ssl-mode=REQUIRED propagate it to the tool. */
if (opt_ssl_required)
if (opt_ssl_mode == SSL_MODE_REQUIRED)
dynstr_append(&ds_cmdline, "--ssl-mode=REQUIRED");
#endif
#ifdef __WIN__
dynstr_append(&ds_cmdline, "\"");