forked from Lainports/freebsd-ports
342c784ae3
switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH
32 lines
1.2 KiB
C++
32 lines
1.2 KiB
C++
--- plugin/x/client/xconnection_impl.cc.orig 2019-09-20 08:30:51 UTC
|
|
+++ plugin/x/client/xconnection_impl.cc
|
|
@@ -521,6 +521,7 @@ XError Connection_impl::get_ssl_error(const int error_
|
|
return XError(CR_SSL_CONNECTION_ERROR, buffer);
|
|
}
|
|
|
|
+#ifndef LIBRESSL_VERSION_NUMBER
|
|
/**
|
|
Set fips mode in openssl library,
|
|
When we set fips mode ON/STRICT, it will perform following operations:
|
|
@@ -559,6 +560,7 @@ int set_fips_mode(const uint fips_mode, char err_strin
|
|
EXIT:
|
|
return rc;
|
|
}
|
|
+#endif
|
|
|
|
XError Connection_impl::activate_tls() {
|
|
if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
|
|
@@ -569,11 +571,13 @@ XError Connection_impl::activate_tls() {
|
|
if (!m_context->m_ssl_config.is_configured())
|
|
return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
|
|
|
|
+#ifndef LIBRESSL_VERSION_NUMBER
|
|
char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
|
|
if (set_fips_mode(static_cast<int>(m_context->m_ssl_config.m_ssl_fips_mode),
|
|
err_string) != 1) {
|
|
return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
|
|
}
|
|
+#endif
|
|
auto ssl_ctx_flags = process_tls_version(
|
|
details::null_when_empty(m_context->m_ssl_config.m_tls_version));
|
|
|