diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-16 20:41:50 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-16 20:41:50 +0400 |
| commit | b88bf50ec138fbe3844a5859d884347c413dbf0d (patch) | |
| tree | 4365c400e3ab541f43677fac80ea4d6f850441db /vio | |
| parent | 103918235469d5e98f8596bbd611f5425af68562 (diff) | |
| parent | 11005f34132ff3e01baa8abce211587c9ee7d058 (diff) | |
| download | mariadb-git-b88bf50ec138fbe3844a5859d884347c413dbf0d.tar.gz | |
Merge 5.5 -> 10.0-base
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c index 6e2ec3f674b..bd3ff5e0ce0 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -309,5 +309,11 @@ void vio_end(void) { #ifdef HAVE_YASSL yaSSL_CleanUp(); +#elif defined(HAVE_OPENSSL) + // This one is needed on the client side + ERR_remove_state(0); + ERR_free_strings(); + EVP_cleanup(); + CRYPTO_cleanup_all_ex_data(); #endif } |