diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-10-17 12:34:08 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-10-17 12:34:08 +0200 |
| commit | a08fd23b4270c4105d441ff573fde2af037146e4 (patch) | |
| tree | 5472783e659b873374f59512f1b20910c1d83ef6 | |
| parent | Update 20018_all_mysql-5.7.23-fix-libressl-support.patch (diff) | |
| download | mysql-extras-a08fd23b4270c4105d441ff573fde2af037146e4.tar.gz mysql-extras-a08fd23b4270c4105d441ff573fde2af037146e4.tar.bz2 mysql-extras-a08fd23b4270c4105d441ff573fde2af037146e4.zip | |
Add 20018_all_percona-server-5.7.23-fix-libressl-support.patchmysql-extras-20181017-1034Z
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | 20018_all_percona-server-5.7.23-fix-libressl-support.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/20018_all_percona-server-5.7.23-fix-libressl-support.patch b/20018_all_percona-server-5.7.23-fix-libressl-support.patch new file mode 100644 index 0000000..a30dbc1 --- /dev/null +++ b/20018_all_percona-server-5.7.23-fix-libressl-support.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/662826 +https://bugs.gentoo.org/668832 + +--- a/sql/auth/sha2_password_common.cc ++++ b/sql/auth/sha2_password_common.cc +@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest, + DBUG_RETURN(true); + } + m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); +-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) + EVP_MD_CTX_cleanup(md_context); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_MD_CTX_reset(md_context); +--- a/vio/viosslfactories.c ++++ b/vio/viosslfactories.c +@@ -123,7 +123,7 @@ static DH *get_dh2048(void) + { + BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + dh->p= p; + dh->g= g; + if (! dh->p || ! dh->g) |