Commit 6288cb93 authored by Dmitry S. Baikov's avatar Dmitry S. Baikov Committed by Daniel Stenberg
Browse files

mbedTLS: THREADING_SUPPORT compilation fix 

Closes #505
parent eefd5a95

lib/vtls/mbedtls.c

+8 −6
Original line number Diff line number Diff line
@@ -173,10 +173,12 @@ mbedtls_connect_step1(struct connectdata *conn, 


#ifdef THREADING_SUPPORT

  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,

                                  connssl->ssn.length)) != 0) {

                              connssl->ssn.id_len);

  if(ret) {

#ifdef MBEDTLS_ERROR_C

    mbedtls_strerror(ret, errorbuf, sizeof(errorbuf));

#endif /* MBEDTLS_ERROR_C */

lib/vtls/polarssl_threadlock.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 ***************************************************************************/

#include "curl_setup.h"



#if defined(USE_POLARSSL) && \

#if (defined(USE_POLARSSL) || defined(USE_MBEDTLS)) && \

    (defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32))



#if defined(USE_THREADS_POSIX)
@@ -150,4 +150,4 @@ int polarsslthreadlock_unlock_function(int n) 
  return 1; /* OK */

}



#endif /* USE_POLARSSL */
 
#endif /* USE_POLARSSL || USE_MBEDTLS */