generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mbedTLS: THREADING_SUPPORT compilation fix

Browse Source 
Closes #505
This commit is contained in:
Dmitry S. Baikov
2015-10-23 15:46:03 -07:00
committed by Daniel Stenberg
parent eefd5a95af
commit 6288cb9304
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/vtls/mbedtls.c
View File

@@ -173,15 +173,17 @@ mbedtls_connect_step1(struct connectdata *conn,
#ifdef THREADING_SUPPORT #ifdef THREADING_SUPPORT
entropy_init_mutex(&entropy); entropy_init_mutex(&entropy);
mbedtls_ctr_drbg_init(&connssl->ctr_drbg);
if((ret = mbedtls_ctr_drbg_init(&connssl->ctr_drbg, entropy_func_mutex, ret = mbedtls_ctr_drbg_seed(&connssl->ctr_drbg, entropy_func_mutex,
&entropy, connssl->ssn.id, &entropy, connssl->ssn.id,
connssl->ssn.length)) != 0) { connssl->ssn.id_len);
if(ret) {
#ifdef MBEDTLS_ERROR_C #ifdef MBEDTLS_ERROR_C
mbedtls_strerror(ret, errorbuf, sizeof(errorbuf)); mbedtls_strerror(ret, errorbuf, sizeof(errorbuf));
#endif /* MBEDTLS_ERROR_C */ #endif /* MBEDTLS_ERROR_C */
failf(data, "Failed - mbedTLS: ctr_drbg_init returned (-0x%04X) %s\n", failf(data, "Failed - mbedTLS: ctr_drbg_init returned (-0x%04X) %s\n",
-ret, errorbuf); -ret, errorbuf);
} }
#else #else
mbedtls_entropy_init(&connssl->entropy); mbedtls_entropy_init(&connssl->entropy);

4
lib/vtls/polarssl_threadlock.c
View File

@@ -22,7 +22,7 @@
***************************************************************************/ ***************************************************************************/
#include "curl_setup.h" #include "curl_setup.h"
#if defined(USE_POLARSSL) && \ #if (defined(USE_POLARSSL) || defined(USE_MBEDTLS)) && \
(defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32)) (defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32))
#if defined(USE_THREADS_POSIX) #if defined(USE_THREADS_POSIX)
@@ -150,4 +150,4 @@ int polarsslthreadlock_unlock_function(int n)
return 1; /* OK */ return 1; /* OK */
} }
#endif /* USE_POLARSSL */ #endif /* USE_POLARSSL || USE_MBEDTLS */