mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +08:00
942896fdd1
- Store the state of the thread-shared entropy for global init/cleanup.
- Use curl's thread support of mbedtls for all Windows builds instead of
just when the threaded resolver is used via USE_THREADS_WIN32.
Prior to this change on global cleanup curl builds that have curl thread
support for mbedtls freed the entropy (8b1d2298) but failed to mark that
it had been freed, which caused problems on subsequent init + transfer.
Bug: https://github.com/curl/curl/discussions/11919#discussioncomment-8687105
Reported-by: awesomekosm@users.noreply.github.com
Closes https://github.com/curl/curl/pull/13071
135 lines
4.1 KiB
C
135 lines
4.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
* Copyright (C) Hoi-Ho Chan, <hoiho.chan@gmail.com>
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(USE_MBEDTLS) && \
|
|
((defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
|
|
defined(_WIN32))
|
|
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
# include <pthread.h>
|
|
# define MBEDTLS_MUTEX_T pthread_mutex_t
|
|
#elif defined(_WIN32)
|
|
# define MBEDTLS_MUTEX_T HANDLE
|
|
#endif
|
|
|
|
#include "mbedtls_threadlock.h"
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/* number of thread locks */
|
|
#define NUMT 2
|
|
|
|
/* This array will store all of the mutexes available to Mbedtls. */
|
|
static MBEDTLS_MUTEX_T *mutex_buf = NULL;
|
|
|
|
int Curl_mbedtlsthreadlock_thread_setup(void)
|
|
{
|
|
int i;
|
|
|
|
mutex_buf = calloc(1, NUMT * sizeof(MBEDTLS_MUTEX_T));
|
|
if(!mutex_buf)
|
|
return 0; /* error, no number of threads defined */
|
|
|
|
for(i = 0; i < NUMT; i++) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_init(&mutex_buf[i], NULL))
|
|
return 0; /* pthread_mutex_init failed */
|
|
#elif defined(_WIN32)
|
|
mutex_buf[i] = CreateMutex(0, FALSE, 0);
|
|
if(mutex_buf[i] == 0)
|
|
return 0; /* CreateMutex failed */
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
|
|
return 1; /* OK */
|
|
}
|
|
|
|
int Curl_mbedtlsthreadlock_thread_cleanup(void)
|
|
{
|
|
int i;
|
|
|
|
if(!mutex_buf)
|
|
return 0; /* error, no threads locks defined */
|
|
|
|
for(i = 0; i < NUMT; i++) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_destroy(&mutex_buf[i]))
|
|
return 0; /* pthread_mutex_destroy failed */
|
|
#elif defined(_WIN32)
|
|
if(!CloseHandle(mutex_buf[i]))
|
|
return 0; /* CloseHandle failed */
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
free(mutex_buf);
|
|
mutex_buf = NULL;
|
|
|
|
return 1; /* OK */
|
|
}
|
|
|
|
int Curl_mbedtlsthreadlock_lock_function(int n)
|
|
{
|
|
if(n < NUMT) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_lock(&mutex_buf[n])) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_lock_function failed\n"));
|
|
return 0; /* pthread_mutex_lock failed */
|
|
}
|
|
#elif defined(_WIN32)
|
|
if(WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_lock_function failed\n"));
|
|
return 0; /* pthread_mutex_lock failed */
|
|
}
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
return 1; /* OK */
|
|
}
|
|
|
|
int Curl_mbedtlsthreadlock_unlock_function(int n)
|
|
{
|
|
if(n < NUMT) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_unlock(&mutex_buf[n])) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_unlock_function failed\n"));
|
|
return 0; /* pthread_mutex_unlock failed */
|
|
}
|
|
#elif defined(_WIN32)
|
|
if(!ReleaseMutex(mutex_buf[n])) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_unlock_function failed\n"));
|
|
return 0; /* pthread_mutex_lock failed */
|
|
}
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
return 1; /* OK */
|
|
}
|
|
|
|
#endif /* USE_MBEDTLS */
|