diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-03 19:37:18 +0100 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-03 19:42:54 +0100 |
commit | c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1 (patch) | |
tree | 0ba9b319f2a2d26a57a86331dafd5a0c008bc745 /20018_all_mysql-5.7.25-fix-libressl-support.patch | |
parent | Add 20018_all_mysql-5.7.25-fix-build-without-server.patch (diff) | |
download | mysql-extras-c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.tar.gz mysql-extras-c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.tar.bz2 mysql-extras-c08bdd10a1c9d7e81532ecd9a1e5cb646c9cf0d1.zip |
Replace mysql LibreSSL patch
Bug: https://bugs.gentoo.org/678682
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to '20018_all_mysql-5.7.25-fix-libressl-support.patch')
-rw-r--r-- | 20018_all_mysql-5.7.25-fix-libressl-support.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/20018_all_mysql-5.7.25-fix-libressl-support.patch b/20018_all_mysql-5.7.25-fix-libressl-support.patch new file mode 100644 index 0000000..63eda07 --- /dev/null +++ b/20018_all_mysql-5.7.25-fix-libressl-support.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/662826 +https://bugs.gentoo.org/668832 +https://bugs.gentoo.org/668894 + +--- 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 < 0x02090000fL) + EVP_MD_CTX_cleanup(md_context); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_MD_CTX_reset(md_context); +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -3408,7 +3408,8 @@ static int init_ssl() + { + #ifdef HAVE_OPENSSL + #ifndef HAVE_YASSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090000fL) + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); +--- a/vio/viosslfactories.c ++++ b/vio/viosslfactories.c +@@ -121,21 +121,19 @@ static DH *get_dh2048(void) + DH *dh; + if ((dh=DH_new())) + { +- BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL); +- BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL); +- if (!p || !g +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- || !DH_set0_pqg(dh, p, NULL, g) +-#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */ +- ) { +- /* DH_free() will free 'p' and 'g' at once. */ ++ 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 || defined(LIBRESSL_VERSION_NUMBER) ++ dh->p=p; ++ dh->g=g; ++ if (! dh->p || ! dh->g) ++#else ++ if (!DH_set0_pqg(dh, p, NULL, g)) ++#endif ++ { + DH_free(dh); +- return NULL; ++ dh = NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- dh->p= p; +- dh->g= g; +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + } + return(dh); + }
\ No newline at end of file |