Page MenuHomeFreeBSD
Files F109675187

D37673.diff
No OneTemporary
Actions

D37673.diff
View Options

diff --git a/databases/mysql80-server/files/patch-mysys_my__kdf.cc b/databases/mysql80-server/files/patch-mysys_my__kdf.cc
new file mode 100644
--- /dev/null
+++ b/databases/mysql80-server/files/patch-mysys_my__kdf.cc
@@ -0,0 +1,20 @@
+--- mysys/my_kdf.cc.orig 2022-12-11 13:12:02 UTC
++++ mysys/my_kdf.cc
+@@ -56,7 +56,7 @@ int create_kdf_key(const unsigned char *key, const uns
+ std::unique_ptr<Key_derivation_function> kdf_function;
+
+ if (kdf_name == "hkdf") {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ kdf_function = std::make_unique<Key_hkdf_function>(kdf_options);
+ #else
+ return 1;
+@@ -71,7 +71,7 @@ int create_kdf_key(const unsigned char *key, const uns
+ return kdf_function->derive_key(key, key_length, rkey, rkey_size);
+ }
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) {
+ kdf_options_ = {kdf_options};
+ }
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
new file mode 100644
--- /dev/null
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
@@ -0,0 +1,12 @@
+--- router/src/harness/src/tls_server_context.cc.orig 2022-12-11 13:24:16 UTC
++++ router/src/harness/src/tls_server_context.cc
+@@ -272,7 +272,8 @@ stdx::expected<void, std::error_code> set_auto_dh_para
+ #if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(3, 0, 0)
+ SSL_CTX_set_dh_auto(ssl_ctx, 1);
+ #else
+-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) \
++ && !defined(LIBRESSL_VERSION_NUMBER)
+ OsslUniquePtr<DH> dh_storage(DH_get_2048_256());
+ #else
+ /*

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 5:41 AM (4 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16545163
Default Alt Text
D37673.diff (1 KB)

Event Timeline