diff options
author | Dima Panov <fluffy@FreeBSD.org> | 2020-05-26 11:04:24 +0000 |
---|---|---|
committer | Dima Panov <fluffy@FreeBSD.org> | 2020-05-26 11:04:24 +0000 |
commit | ac5429b4979b8cc0e5b2a2d25d4445506ae0b24d (patch) | |
tree | d5d7f72d44bc33f3bb43eda72b1aefd4851c82e7 /databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc | |
parent | security/i2p: Update to 0.9.46 (diff) |
databases/percona57-{client, server}: update to 5.7.30-33 release
Bugs Fixed:
PS-6979: Modify the processing to call clean up functions to remove CREATE USER statement from the processlist after the statement has completed (Upstream #99200)
PS-6860: Merge innodb_buffer_pool_pages_LRU_flushed into buf_get_total_stat()
PS-6811: Correct service failure of asserting ACL_PROXY_USER when skip-name-resolve=1 and there is a Proxy user (Upstream #98908)
PS-6112: Correct Binlog_snapshot_gtid inconsistency when mysqldump was used with –single-transaction.
PS-6945: Correct tokubackup plugin process exported API to allow large file backups.
PS-6856: Correct binlogs corruptions in PS 5.7.28 and 5.7.29 (Upstream #97531)
PS-6946: Correct tokubackup processing to free memory use from the address and thread sanitizers
PS-5893: Add support for running multiple instances with systemD on Debian.
PS-5620: Modify Docker image to support supplying custom TLS certificates
PS-4573: Implement use of a single config file - mysqld.cnf file.
PS-7041: Correct Compilation error when -DWITH_EDITLINE=bundled is used
PS-7020: Modify MTR tests for Ubuntu 20.04 to include python2 (python 2.6 or higher) and python3
PS-6974: Correct instability in the rocksdb.drop_cf_* tests
PS-6969: Correct instability in the rocksdb.index_stats_large_table
PS-6954: Correct tokudb-backup-plugin to avoid collision between -std=c++11 and -std=gnu++03.
PS-6925: Correct mismatched default socket values for mysqld and mysqld_safe
PS-6899: Correct main.events_bugs and main.events_1 to interpret date 01-01-2020 properly (Upstream #98860)
PS-6796: Correct instability in percona_changed_page_bmp_shutdown_thread
PS-6773: Initialize values in sha256_password_authenticate (Upstream #98223)
PS-5844: Fix a memory leak after ‘innodb.alter_crash’ in ‘prepare_inplace_alter_table_dict()’ (Upstream #96472)
PS-5735: Correct 5.7 package to install the charsets on CentOS 7
PS-4757: Remove CHECK_IF_CURL_DEPENDS_ON_RTMP to build keyring_vault for unconditional test
PS-4649: Document PerconaFT in TokuDB which is fractal tree indexing to enhance the B-tree data structure
MFH: 2020Q2
Relnotes: https://www.percona.com/doc/percona-server/5.7/release-notes/Percona-Server-5.7.30-33.html
Security: 21d59ea3-8559-11ea-a5e2-d4c9ef517024 (MySQL - Server)
Security: 622b5c47-855b-11ea-a5e2-d4c9ef517024 (MySQL - Client)
Diffstat (limited to 'databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc')
-rw-r--r-- | databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc index 56a64a6300a5..453c89a71c12 100644 --- a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc +++ b/databases/percona57-server/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 */ |