diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /databases/mysql94-server/files/patch-mysys_my__kdf.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'databases/mysql94-server/files/patch-mysys_my__kdf.cc')
| -rw-r--r-- | databases/mysql94-server/files/patch-mysys_my__kdf.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/databases/mysql94-server/files/patch-mysys_my__kdf.cc b/databases/mysql94-server/files/patch-mysys_my__kdf.cc new file mode 100644 index 000000000000..c316de281c26 --- /dev/null +++ b/databases/mysql94-server/files/patch-mysys_my__kdf.cc @@ -0,0 +1,20 @@ +--- mysys/my_kdf.cc.orig 2024-04-10 06:26:28 UTC ++++ mysys/my_kdf.cc +@@ -57,7 +57,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; +@@ -72,7 +72,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}; + } |