mirror of
https://git.freebsd.org/ports.git
synced 2025-05-18 01:53:13 -04:00
904e2c69b7
Full Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html Submitted by: fluffy MFH: 2020Q3 Security: 0ed71663-c369-11ea-b53c-d4c9ef517024 Sponsored by: Netzkommune GmbH
26 lines
969 B
C++
26 lines
969 B
C++
--- sql/mysqld.cc.orig 2019-09-20 08:30:51 UTC
|
|
+++ sql/mysqld.cc
|
|
@@ -5109,7 +5109,7 @@ static int init_thread_environment() {
|
|
|
|
static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define FILE_LINE_ARGS
|
|
#else
|
|
#define FILE_LINE_ARGS , const char *, int
|
|
@@ -5143,12 +5143,14 @@ static void init_ssl() {
|
|
}
|
|
|
|
static int init_ssl_communication() {
|
|
+#ifndef LIBRESSL_VERSION_NUMBER
|
|
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
|
|
int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
|
|
if (ret_fips_mode != 1) {
|
|
LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
|
|
return 1;
|
|
}
|
|
+#endif /* LIBRESSL_VERSION_NUMBER */
|
|
if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
|
|
&server_main_callback, opt_initialize))
|
|
return 1;
|