07b2ef28a0
Removed the .dll files for the libraries from the root directory. They are now copied from the 3rdparty folder when your build finishes and the project requires them. If you clean your project they will also automatically be removed from the root directory again. Updated libraries: MySQL 5.0.20 -> 6.1.9 PCRE 8.30 -> 8.33.0.1 UTF8 Both Win32 and x64 are now supported. Remember to clean and build when you switch the target platform, otherwise you will end up with the wrong .dll files at runtime.
64 lines
2.2 KiB
C
64 lines
2.2 KiB
C
/* Copyright (c) 2000, 2016, 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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
#error This header is supposed to be used only in the client
|
|
#endif
|
|
|
|
case OPT_SSL_MODE:
|
|
opt_ssl_mode= find_type_or_exit(argument, &ssl_mode_typelib,
|
|
opt->name);
|
|
ssl_mode_set_explicitly= TRUE;
|
|
break;
|
|
case OPT_SSL_SSL:
|
|
CLIENT_WARN_DEPRECATED("--ssl", "--ssl-mode");
|
|
if (!opt_use_ssl_arg)
|
|
opt_ssl_mode= SSL_MODE_DISABLED;
|
|
else if (opt_ssl_mode < SSL_MODE_REQUIRED)
|
|
opt_ssl_mode= SSL_MODE_REQUIRED;
|
|
break;
|
|
case OPT_SSL_VERIFY_SERVER_CERT:
|
|
CLIENT_WARN_DEPRECATED("--ssl-verify-server-cert",
|
|
"--ssl-mode=VERIFY_IDENTITY");
|
|
if (!opt_ssl_verify_server_cert_arg)
|
|
{
|
|
if (opt_ssl_mode >= SSL_MODE_VERIFY_IDENTITY)
|
|
opt_ssl_mode= SSL_MODE_VERIFY_CA;
|
|
}
|
|
else
|
|
opt_ssl_mode= SSL_MODE_VERIFY_IDENTITY;
|
|
break;
|
|
case OPT_SSL_CA:
|
|
case OPT_SSL_CAPATH:
|
|
/* Don't change ssl-mode if set explicitly. */
|
|
if (!ssl_mode_set_explicitly)
|
|
opt_ssl_mode= SSL_MODE_VERIFY_CA;
|
|
break;
|
|
case OPT_SSL_KEY:
|
|
case OPT_SSL_CERT:
|
|
case OPT_SSL_CIPHER:
|
|
case OPT_SSL_CRL:
|
|
case OPT_SSL_CRLPATH:
|
|
case OPT_TLS_VERSION:
|
|
#ifdef HAVE_YASSL
|
|
/* crl has no effect in yaSSL. */
|
|
opt_ssl_crl= NULL;
|
|
opt_ssl_crlpath= NULL;
|
|
#endif /* HAVE_YASSL */
|
|
break;
|
|
#endif /* HAVE_OPENSSL */
|