[tor-commits] [tor/master] Add free_openssl() to crypto_openssl module.

[nickm@xxxxxxxxxxxxxx]

commit 7353c9496e4f67321fbeee594cb8c488cff20aaf
Author: Fernando Fernandez Mancera <ffernandezmancera@xxxxxxxxx>
Date:   Mon Jan 8 15:31:41 2018 +0100

    Add free_openssl() to crypto_openssl module.
    
    Add free_openssl() function to free the memory allocated for OpenSSL version
    management variables. It is required since OpenSSL management has been isolated
    from the crypto module.
    
    Follows #24658.
    
    Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@xxxxxxxxx>
---
 src/common/crypto.c         | 3 +--
 src/common/crypto_openssl.c | 8 ++++++++
 src/common/crypto_openssl.h | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 0abb4a1af..12f4270cc 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -3348,8 +3348,7 @@ crypto_global_cleanup(void)
   }
 #endif /* !defined(NEW_THREAD_API) */
 
-  tor_free(crypto_openssl_version_str);
-  tor_free(crypto_openssl_header_version_str);
+  free_openssl();
   return 0;
 }
 
diff --git a/src/common/crypto_openssl.c b/src/common/crypto_openssl.c
index 03485c052..e7495f972 100644
--- a/src/common/crypto_openssl.c
+++ b/src/common/crypto_openssl.c
@@ -113,3 +113,11 @@ setup_openssl_threading(void)
   return 0;
 }
 
+/** free OpenSSL variables */
+void
+free_openssl(void)
+{
+  tor_free(crypto_openssl_version_str);
+  tor_free(crypto_openssl_header_version_str);
+}
+
diff --git a/src/common/crypto_openssl.h b/src/common/crypto_openssl.h
index 7b5545f69..0c6bccad4 100644
--- a/src/common/crypto_openssl.h
+++ b/src/common/crypto_openssl.h
@@ -101,5 +101,8 @@ void tor_set_openssl_thread_id(CRYPTO_THREADID *threadid);
 /* OpenSSL threading setup function */
 int setup_openssl_threading(void);
 
+/* Tor OpenSSL utility functions */
+void free_openssl(void);
+
 #endif /* !defined(TOR_CRYPTO_OPENSSL_H) */
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits