diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2023-11-19 16:57:05 +0100 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2023-11-19 17:00:25 +0100 |
| commit | 6179bcf1cc811e58beeadf360f861beb20dec044 (patch) | |
| tree | 38c563b12a6f5d7ea3920d1418621f4502e03ad1 /databases/mysql80-server/files/patch-vio_viosslfactories.cc | |
| parent | www/R-cran-shiny: Update to 1.8.0 (diff) | |
databases/mysql80-{client, server}: Update to latest release 8.0.35
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
Diffstat (limited to 'databases/mysql80-server/files/patch-vio_viosslfactories.cc')
| -rw-r--r-- | databases/mysql80-server/files/patch-vio_viosslfactories.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc index 2882353d79f0..4951cc995df3 100644 --- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc +++ b/databases/mysql80-server/files/patch-vio_viosslfactories.cc @@ -1,14 +1,14 @@ ---- vio/viosslfactories.cc.orig 2022-07-06 21:36:34 UTC -+++ vio/viosslfactories.cc -@@ -40,6 +40,7 @@ - #include "vio/vio_priv.h" +--- 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 <openssl/dh.h> -+#include <openssl/crypto.h> + #include "my_openssl_fips.h" ++#include "openssl/crypto.h" + #define TLS_VERSION_OPTION_SIZE 256 - #if OPENSSL_VERSION_NUMBER < 0x10002000L - #include <openssl/ec.h> -@@ -484,7 +485,7 @@ long process_tls_version(const char *tls_version) { + /* +@@ -417,7 +418,7 @@ long process_tls_version(const char *tls_version) { const char *separator = ","; char *token, *lasts = nullptr; @@ -17,7 +17,7 @@ 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}; -@@ -559,7 +560,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -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 @@ -26,7 +26,7 @@ | SSL_OP_NO_TLSv1_3 #endif /* HAVE_TLSv13 */ | SSL_OP_NO_TICKET); -@@ -568,7 +569,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -498,7 +499,7 @@ static struct st_VioSSLFd *new_VioSSLFd( return nullptr; if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ? @@ -35,7 +35,7 @@ TLS_client_method() : TLS_server_method() #else /* HAVE_TLSv13 */ -@@ -583,7 +584,7 @@ static struct st_VioSSLFd *new_VioSSLFd( +@@ -513,7 +514,7 @@ static struct st_VioSSLFd *new_VioSSLFd( return nullptr; } |