moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

openssl: ERR_remove_thread_state() is deprecated in latest 1.1.0

Browse Source 
See OpenSSL commit 21e001747d4a
This commit is contained in:
Daniel Stenberg 2016-05-19 11:39:59 +02:00
parent 8243a9581b
commit 48114a8634
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vtls/openssl.c
View File

@ -97,8 +97,8 @@
#define HAVE_ERR_REMOVE_THREAD_STATE 1 #define HAVE_ERR_REMOVE_THREAD_STATE 1
#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \ #if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
!defined(LIBRESSL_VERSION_NUMBER) !defined(LIBRESSL_VERSION_NUMBER)
/* OpenSSL 1.1.0-pre4 removed the argument! */ /* OpenSSL 1.1.0 deprecates the function */
#define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1 #define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1
#endif #endif
#endif #endif
@ -737,8 +737,8 @@ void Curl_ossl_cleanup(void)
ERR_free_strings(); ERR_free_strings();
/* Free thread local error state, destroying hash upon zero refcount */ /* Free thread local error state, destroying hash upon zero refcount */
#ifdef HAVE_ERR_REMOVE_THREAD_STATE_NOARG #ifdef HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED
ERR_remove_thread_state();
#elif defined(HAVE_ERR_REMOVE_THREAD_STATE) #elif defined(HAVE_ERR_REMOVE_THREAD_STATE)
ERR_remove_thread_state(NULL); ERR_remove_thread_state(NULL);
#else #else