- David Byron fixed Curl_ossl_cleanup to actually call ENGINE_cleanup when

  available.

diff --git a/CHANGES b/CHANGES
index 52436e91a5319b13869b4a7dbeb4aa15c65f0435..82a9f2d419b5b44f5c1883ed5bbeea3f5e143461 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel Stenberg (17 Dec 2009)
+- David Byron fixed Curl_ossl_cleanup to actually call ENGINE_cleanup when
+  available.
+  
 - Follow-up fix for the proxy fix I did for Jon Nelson's bug. It turned out I
   was a bit too quick and broke test case 1101 with that change. The order of
   some of the setups is sensitive. I now changed it slightly again to make

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eeb2cb87175c940596aa5233ed85a2a154899711..467f22a0975fb8b0401aed4f31f7beed591081e7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -35,6 +35,7 @@ This release includes the following bugfixes:
  o multi interface with OpenSSL read already freed memory when closing down
  o --retry didn't do right for FTP transient errors
  o some *_proxy environment variables didn't function
+ o libcurl-OpenSSL engine cleanup
 
 This release includes the following known bugs:
 

diff --git a/configure.ac b/configure.ac
index 9618ed87049cc1db22da3e98a4ef65b04f3eeddf..d7d7598b15bbffb3c93d6c01f10b8d50ca82f0e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1397,6 +1397,7 @@ if test X"$OPT_SSL" != Xno; then
     AC_CHECK_FUNCS( RAND_status \
                     RAND_screen \
                     RAND_egd \
+                    ENGINE_cleanup \
                     CRYPTO_cleanup_all_ex_data \
                     SSL_get_shutdown )
 

diff --git a/lib/ssluse.c b/lib/ssluse.c
index c4a809c0f4a02dad834f57e58b5263fde94075db..97ffe61808f026d3f72c83ee0ad728d04a96bb86 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -709,7 +709,7 @@ void Curl_ossl_cleanup(void)
   /* EVP_cleanup() removes all ciphers and digests from the table. */
   EVP_cleanup();
 
-#ifdef HAVE_ENGINE_cleanup
+#ifdef HAVE_ENGINE_CLEANUP
   ENGINE_cleanup();
 #endif