diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-03 21:22:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 18:53:10 +0200 |
| commit | ccca4f43c92916c347210a7f9a8126f2aa3f6c31 (patch) | |
| tree | 28d08c49ae7f27c861cb6f8b8cf770ef0b32ae9c /plugin | |
| parent | f8866f8f665ac26beb31842fef48ecee5feb346e (diff) | |
| download | mariadb-git-ccca4f43c92916c347210a7f9a8126f2aa3f6c31.tar.gz | |
MDEV-10332 support for OpenSSL 1.1 and LibreSSL
post-review fixes:
* move all ssl implementation related ifdefs/defines to one file
(ssl_compat.h)
* work around OpenSSL-1.1 desire to malloc every EVP context by
run-time checking that context allocated on the stack is big enough
(openssl.c)
* use newer version of the AWS SDK for OpenSSL 1.1
* use get_dh2048() function as generated by openssl 1.1
(viosslfactories.c)
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 06e0565040a..f612bd39be0 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -116,6 +116,8 @@ ELSE() # We increase the version for macs however, so the newest mac could built it. IF(APPLE) SET(GIT_TAG "1.0.100") + ELSEIF(_OPENSSL_VERSION VERSION_EQUAL "1.1") + SET(GIT_TAG "1.0.114") ELSE() SET(GIT_TAG "1.0.8") ENDIF() |