From 613e9baa1d1bebe6d4b6ed2a57d2e696c256cc65 Mon Sep 17 00:00:00 2001 From: Felix Palmen Date: Sun, 11 Dec 2022 14:50:47 +0100 Subject: databases/mysql80-server: Fix build with libressl PR: 267672 Approved by: joneum (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37673 --- .../mysql80-server/files/patch-mysys_my__kdf.cc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 databases/mysql80-server/files/patch-mysys_my__kdf.cc (limited to 'databases/mysql80-server/files/patch-mysys_my__kdf.cc') 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 index 000000000000..e4b12bfc09a0 --- /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 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(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 *kdf_options) { + kdf_options_ = {kdf_options}; + } -- cgit v1.2.3