6179bcf1cc
Changelogs: 8.0.34: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-34.html 8.0.35: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-35.html Sponsored by: Netzkommune GmbH
47 lines
1.8 KiB
C++
47 lines
1.8 KiB
C++
--- vio/viosslfactories.cc.orig 2023-11-18 20:56:37.098235000 +0100
|
|
+++ vio/viosslfactories.cc 2023-11-19 09:20:02.284708000 +0100
|
|
@@ -43,6 +43,7 @@
|
|
#include <dh_ecdh_config.h>
|
|
|
|
#include "my_openssl_fips.h"
|
|
+#include "openssl/crypto.h"
|
|
#define TLS_VERSION_OPTION_SIZE 256
|
|
|
|
/*
|
|
@@ -417,7 +418,7 @@ long process_tls_version(const char *tls_version) {
|
|
const char *separator = ",";
|
|
char *token, *lasts = nullptr;
|
|
|
|
-#ifdef HAVE_TLSv13
|
|
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"};
|
|
const char ctx_flag_default[] = "TLSv1.2,TLSv1.3";
|
|
const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
|
|
@@ -489,7 +490,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
|
|
ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
|
|
(SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
|
|
SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2
|
|
-#ifdef HAVE_TLSv13
|
|
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
| SSL_OP_NO_TLSv1_3
|
|
#endif /* HAVE_TLSv13 */
|
|
| SSL_OP_NO_TICKET);
|
|
@@ -498,7 +499,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
|
|
return nullptr;
|
|
|
|
if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
|
|
-#ifdef HAVE_TLSv13
|
|
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
TLS_client_method()
|
|
: TLS_server_method()
|
|
#else /* HAVE_TLSv13 */
|
|
@@ -513,7 +514,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
|
|
return nullptr;
|
|
}
|
|
|
|
-#ifdef HAVE_TLSv13
|
|
+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
/*
|
|
Set OpenSSL TLS v1.3 ciphersuites.
|
|
Note that an empty list is permissible.
|