|
Lines 2-10
https://bugs.gentoo.org/662826
Link Here
|
| 2 |
https://bugs.gentoo.org/668832 |
2 |
https://bugs.gentoo.org/668832 |
| 3 |
https://bugs.gentoo.org/668818 |
3 |
https://bugs.gentoo.org/668818 |
| 4 |
https://bugs.gentoo.org/668894 |
4 |
https://bugs.gentoo.org/668894 |
|
|
5 |
https://bugs.gentoo.org/669216 |
| 5 |
|
6 |
|
| 6 |
--- a/mysys_ssl/my_crypt.cc |
7 |
--- a/mysys_ssl/my_crypt.cc |
| 7 |
+++ b/mysys_ssl/my_crypt.cc |
8 |
+++ b/mysys_ssl/my_crypt.cc |
|
|
9 |
@@ -30,7 +30,7 @@ |
| 10 |
#include <boost/move/unique_ptr.hpp> |
| 11 |
#include <boost/core/noncopyable.hpp> |
| 12 |
|
| 13 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 14 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 15 |
#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) |
| 16 |
#define RAND_OpenSSL() RAND_SSLeay() |
| 17 |
#endif |
| 8 |
@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() |
18 |
@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() |
| 9 |
MyEncryptionCTX::~MyEncryptionCTX() |
19 |
MyEncryptionCTX::~MyEncryptionCTX() |
| 10 |
{ |
20 |
{ |
|
Lines 29-41
https://bugs.gentoo.org/668894
Link Here
|
| 29 |
EVP_MD_CTX_reset(md_context); |
39 |
EVP_MD_CTX_reset(md_context); |
| 30 |
--- a/sql/mysqld.cc |
40 |
--- a/sql/mysqld.cc |
| 31 |
+++ b/sql/mysqld.cc |
41 |
+++ b/sql/mysqld.cc |
| 32 |
@@ -3679,7 +3679,8 @@ static int init_ssl() |
42 |
@@ -3678,6 +3678,7 @@ static int init_ssl() |
|
|
43 |
{ |
| 44 |
#ifdef HAVE_OPENSSL |
| 45 |
#ifndef HAVE_YASSL |
| 46 |
+#ifndef LIBRESSL_VERSION_NUMBER |
| 47 |
int fips_mode= FIPS_mode(); |
| 48 |
if (fips_mode != 0) |
| 49 |
{ |
| 50 |
@@ -3687,7 +3688,9 @@ static int init_ssl() |
| 33 |
" Disabling FIPS."); |
51 |
" Disabling FIPS."); |
| 34 |
FIPS_mode_set(0); |
52 |
FIPS_mode_set(0); |
| 35 |
} |
53 |
} |
| 36 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
54 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
|
|
55 |
+#endif |
| 37 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
56 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
| 38 |
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) |
57 |
+ defined(LIBRESSL_VERSION_NUMBER) |
| 39 |
CRYPTO_malloc_init(); |
58 |
CRYPTO_malloc_init(); |
| 40 |
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
59 |
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |
| 41 |
OPENSSL_malloc_init(); |
60 |
OPENSSL_malloc_init(); |
| 42 |
- |
|
|
