mirror of
https://git.freebsd.org/ports.git
synced 2025-07-10 13:59:22 -04:00
ad97e3ac48
This update includes Oracle Critical Patch Advisory published on July 2018 More info: http://www.oracle.com/technetwork/security-advisory/cpujul2018-4258247.html#AppendixMSQL Also: Delete upstreamed hunks of patches. Change local patches regarding upstream changes. PR: 229861 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: The FreeBSD Foundation
11 lines
517 B
C++
11 lines
517 B
C++
--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC
|
|
+++ sql-common/client.cc
|
|
@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql,
|
|
#endif
|
|
break;
|
|
case MYSQL_OPT_SSL_FIPS_MODE: {
|
|
-#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
|
|
+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
|
|
ENSURE_EXTENSIONS_PRESENT(&mysql->options);
|
|
mysql->options.extension->ssl_fips_mode = *(uint *)arg;
|