diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
| commit | 271fed41061e25faa47b7a28108cf101ebb3551d (patch) | |
| tree | 733bf84d468a1d47c71c87cfcee33098a090e3c5 /vio/viosslfactories.c | |
| parent | ff26d93a8c25d667709180ad13a090309631990d (diff) | |
| parent | e1385f2083f782d7064db3c0059fcca45bfcb2a4 (diff) | |
| download | mariadb-git-271fed41061e25faa47b7a28108cf101ebb3551d.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 96275b95f68..5d7fe60e453 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -17,6 +17,10 @@ #include "vio_priv.h" #ifdef HAVE_OPENSSL +#ifndef HAVE_YASSL +#include <openssl/dh.h> +#include <openssl/bn.h> +#endif static my_bool ssl_algorithms_added = FALSE; static my_bool ssl_error_strings_loaded= FALSE; |