Merge remote-tracking branch 'origin/pr/603' into baremetal

This commit is contained in:
Simon Butcher 2019-07-10 15:40:32 +01:00
commit fabfb8578a
12 changed files with 44 additions and 0 deletions

View file

@ -451,6 +451,7 @@ struct options
int query_config( const char *config );
#if defined(MBEDTLS_DEBUG_C)
static void my_debug( void *ctx, int level,
const char *file, int line,
const char *str )
@ -466,6 +467,7 @@ static void my_debug( void *ctx, int level,
basename, line, level, str );
fflush( (FILE *) ctx );
}
#endif /* MBEDTLS_DEBUG_C */
#if !defined(MBEDTLS_SSL_CONF_RECV) && \
@ -1778,7 +1780,9 @@ int main( int argc, char *argv[] )
mbedtls_ssl_conf_rng_ctx( &conf, &ctr_drbg );
#endif
#if defined(MBEDTLS_DEBUG_C)
mbedtls_ssl_conf_dbg( &conf, my_debug, stdout );
#endif
#if !defined(MBEDTLS_SSL_CONF_READ_TIMEOUT)
mbedtls_ssl_conf_read_timeout( &conf, opt.read_timeout );