diff options
Diffstat (limited to 'databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc')
| -rw-r--r-- | databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc index 56a64a6300a5..453c89a71c12 100644 --- a/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc +++ b/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc @@ -1,6 +1,6 @@ --- mysys_ssl/my_crypt.cc.orig 2019-05-16 05:06:00 UTC +++ mysys_ssl/my_crypt.cc -@@ -30,7 +30,7 @@ +@@ -26,7 +26,7 @@ #include <boost/move/unique_ptr.hpp> #include <boost/core/noncopyable.hpp> @@ -9,7 +9,16 @@ #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) #define RAND_OpenSSL() RAND_SSLeay() #endif -@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() +@@ -80,7 +80,7 @@ class MyEncryptionCTX : private boost::noncopyable (pr + + MyEncryptionCTX::MyEncryptionCTX() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ctx= new EVP_CIPHER_CTX(); + EVP_CIPHER_CTX_init(ctx); + #else +@@ -91,7 +91,8 @@ MyEncryptionCTX::MyEncryptionCTX() MyEncryptionCTX::~MyEncryptionCTX() { @@ -19,3 +28,12 @@ EVP_CIPHER_CTX_cleanup(ctx); delete ctx; ERR_remove_thread_state(0); +@@ -340,7 +341,7 @@ int my_aes_crypt(const my_aes_mode mode, int flags, + res2= my_aes_crypt_finish(ctx, dst + d1, &d2); + if (res1 || res2) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + /* in case of failure clear error queue */ + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |