diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
| commit | 5091a4ba755250ed8e35f4f5a39a118d476cd8f1 (patch) | |
| tree | 370ba468d78204544b56e9d967d8d09e1317a1ed /mysys_ssl/my_crypt.cc | |
| parent | 84eaf0911f311acba797c265ef7508ab6c108b35 (diff) | |
| parent | 0880284bf715b4916cc735e19b76d1062c2bfdcf (diff) | |
| download | mariadb-git-5091a4ba755250ed8e35f4f5a39a118d476cd8f1.tar.gz | |
Merge tag 'mariadb-10.0.19' into 10.1
Diffstat (limited to 'mysys_ssl/my_crypt.cc')
| -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 b95879a3012..7ca65b253e6 100644 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -34,6 +34,7 @@ typedef TaoCrypt::byte KeyByte; #else #include <openssl/evp.h> #include <openssl/aes.h> +#include <openssl/err.h> typedef int Dir; static const Dir CRYPT_ENCRYPT = 1; @@ -59,7 +60,7 @@ typedef uchar KeyByte; struct MyCTX : EVP_CIPHER_CTX { MyCTX() { EVP_CIPHER_CTX_init(this); } - ~MyCTX() { EVP_CIPHER_CTX_cleanup(this); } + ~MyCTX() { EVP_CIPHER_CTX_cleanup(this); ERR_remove_state(0); } }; #endif |