summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-10-16 17:48:31 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-10-16 17:48:31 +0400
commit049000101a56596b3aad1f3b6e050010c6d6f74b (patch)
tree31736576693e2b114399fe5cd8e13029199c6c2f /vio
parent3cc3bcfcc5f80505fa48681b86d5f486cf9dc248 (diff)
parentde4ca539b896abfb2888ce7dee6f7de39d2e9657 (diff)
downloadmariadb-git-049000101a56596b3aad1f3b6e050010c6d6f74b.tar.gz
Merge 5.1 -> 5.3
Diffstat (limited to 'vio')
-rw-r--r--vio/vio.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c
index 486fe63da05..7b2cf45142f 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -250,5 +250,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
}