summaryrefslogtreecommitdiff
path: root/vio/vio.c
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-10-17 19:01:57 +0300
committerunknown <sanja@askmonty.org>2013-10-17 19:01:57 +0300
commit8f4eb208d2988354f34b9a99e500c5c82d86ffbd (patch)
treecfdf6b4ff5ab81a85cfaff5580d22b3d646cc324 /vio/vio.c
parentd21f9bab3391e7fb0913d14cd77cb2832475927e (diff)
parentb88bf50ec138fbe3844a5859d884347c413dbf0d (diff)
downloadmariadb-git-8f4eb208d2988354f34b9a99e500c5c82d86ffbd.tar.gz
merge 10.0-base -> 10.0
Diffstat (limited to 'vio/vio.c')
-rw-r--r--vio/vio.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c
index 56dff377105..ea95758f212 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -384,5 +384,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
}