diff options
| author | Georg Richter <georg@mariadb.com> | 2016-10-13 12:07:14 +0200 |
|---|---|---|
| committer | Georg Richter <georg@mariadb.com> | 2016-10-13 12:07:14 +0200 |
| commit | 351e6c8ede92ce2c22b9e7dfe07f992d09661478 (patch) | |
| tree | 99f95ff39c350cc68bdc7406a26793f6e75fcf0c /client/mysql.cc | |
| parent | 9a0fdab9ffab032aaf70ebf1ed255480b850a462 (diff) | |
| download | mariadb-git-10.2-good_bye_yassl.tar.gz | |
- Replaced yassl by gnutls10.2-good_bye_yassl
TLS functionality is now handled in ma_tls_vio.c
- added new parameter ssl_passphrase for passphrase protected
keys
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 65b7c192595..ec8c006ca86 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1360,7 +1360,7 @@ static bool do_connect(MYSQL *mysql, const char *host, const char *user, { if (opt_secure_auth) mysql_options(mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth); -#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) +#if defined(HAVE_TLS) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl) { mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, @@ -4736,7 +4736,7 @@ com_status(String *buffer __attribute__((unused)), mysql_free_result(result); } -#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) +#if defined(HAVE_TLS) && !defined(EMBEDDED_LIBRARY) if ((status_str= mysql_get_ssl_cipher(&mysql))) tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n", status_str); |