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 /sql/sys_vars.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 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 5cc81585ed5..2ace99c6772 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3127,7 +3127,7 @@ static Sys_var_set Sys_old_behavior( SESSION_VAR(old_behavior), CMD_LINE(REQUIRED_ARG), old_mode_names, DEFAULT(0)); -#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) +#if defined(HAVE_TLS) && !defined(EMBEDDED_LIBRARY) #define SSL_OPT(X) CMD_LINE(REQUIRED_ARG,X) #else #define SSL_OPT(X) NO_CMD_LINE @@ -3476,12 +3476,12 @@ static Sys_var_charptr Sys_malloc_library( READ_ONLY GLOBAL_VAR(malloc_library), CMD_LINE_HELP_ONLY, IN_SYSTEM_CHARSET, DEFAULT(MALLOC_LIBRARY)); -#ifdef HAVE_YASSL -#include <openssl/ssl.h> -#define SSL_LIBRARY "YaSSL " YASSL_VERSION -#elif HAVE_OPENSSL +#if defined(HAVE_OPENSSL) #include <openssl/crypto.h> #define SSL_LIBRARY SSLeay_version(SSLEAY_VERSION) +#elif defined(HAVE_GNUTLS) +#include <gnutls/gnutls.h> +#define SSL_LIBRARY "GnuTLS " GNUTLS_VERSION #else #error No SSL? #endif @@ -4169,6 +4169,10 @@ static Sys_var_have Sys_have_openssl( "have_openssl", "have_openssl", READ_ONLY GLOBAL_VAR(have_openssl), NO_CMD_LINE); +static Sys_var_have Sys_have_gnutls( + "have_gnutls", "have_gnutls", + READ_ONLY GLOBAL_VAR(have_gnutls), NO_CMD_LINE); + static Sys_var_have Sys_have_profiling( "have_profiling", "have_profiling", READ_ONLY GLOBAL_VAR(have_profiling), NO_CMD_LINE); |