diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-08 00:25:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:18 +0100 |
| commit | f3da18f635f43fdd4438213750ee97af74400ec0 (patch) | |
| tree | 19e8ee82ce8fb5e6c4b83b7819e32e66b9fc7944 /mysys_ssl | |
| parent | faad7e0c1899798172d779746dd9bb2c1db89eb9 (diff) | |
| download | mariadb-git-f3da18f635f43fdd4438213750ee97af74400ec0.tar.gz | |
cmake-time detection for EVP_aes_128_ctr()
because old openssl versions (e.g. on labrador) don't have it
Diffstat (limited to 'mysys_ssl')
| -rw-r--r-- | mysys_ssl/my_crypt.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc index 0d49999fdfa..d92f76d633b 100644 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -11,7 +11,6 @@ #include "mysql.h" #include <openssl/evp.h> #include <openssl/aes.h> -#include <openssl/rand.h> static const int CRYPT_ENCRYPT = 1; static const int CRYPT_DECRYPT = 0; @@ -350,6 +349,8 @@ C_MODE_END #else /* OpenSSL */ +#include <openssl/rand.h> + C_MODE_START Crypt_result my_random_bytes(uchar* buf, int num) |