diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/ssluse.c | 2 |
4 files changed, 6 insertions, 1 deletions
@@ -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 eeb2cb871..467f22a09 100644 --- 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 9618ed870..d7d7598b1 100644 --- 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 c4a809c0f..97ffe6180 100644 --- 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 |