diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 10:36:47 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 10:36:47 -0300 |
commit | f63046319b333daf85330765c398e5ab52aebf20 (patch) | |
tree | 393336c135c375657b4073640bc3c24b2c940a83 /config | |
parent | bc774bd332863bb5379d75e2f2605bdd80e4fb3c (diff) | |
download | mariadb-git-f63046319b333daf85330765c398e5ab52aebf20.tar.gz |
Bug#34236: Various possibly related SSL crashes
The problem was that the bundled yaSSL library was being built
without thread safety support regardless of the thread safeness
of the compoments linked with it.
The solution is to enable yaSSL thread safety support if any
component (server or client) is to be built with thread support.
Also, generate new certificates for yaSSL's test suite.
Diffstat (limited to 'config')
-rw-r--r-- | config/ac-macros/yassl.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 967dcbf764a..f9bd2b06098 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -32,6 +32,12 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ ;; esac AC_SUBST([yassl_taocrypt_extra_cxxflags]) + # Thread safe check + yassl_thread_cxxflags="" + if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"; then + yassl_thread_cxxflags="-DYASSL_THREAD_SAFE" + fi + AC_SUBST([yassl_thread_cxxflags]) # Link extra/yassl/include/openssl subdir to include/ yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl" AC_SUBST(yassl_h_ln_cmd) |