From beccd9f22658b44611496a7cd15c8ca6c2a4b969 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Fri, 11 Oct 2013 15:20:27 +0200 Subject: [PATCH] Explicit void pointer cast for buggy MS compiler --- library/ssl_srv.c | 3 ++- library/ssl_tls.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/library/ssl_srv.c b/library/ssl_srv.c index 15d14fa88..aa754306f 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c @@ -541,7 +541,8 @@ static int ssl_parse_supported_elliptic_curves( ssl_context *ssl, if( ( curves = polarssl_malloc( our_size * sizeof( *curves ) ) ) == NULL ) return( POLARSSL_ERR_SSL_MALLOC_FAILED ); - memset( curves, 0, our_size * sizeof( *curves ) ); + /* explicit void pointer cast for buggy MS compiler */ + memset( (void *) curves, 0, our_size * sizeof( *curves ) ); ssl->handshake->curves = curves; p = buf + 2; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index edcc1c884..3f3bf11a7 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -4161,7 +4161,8 @@ void ssl_handshake_free( ssl_handshake_params *handshake ) #endif #if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C) - polarssl_free( handshake->curves ); + /* explicit void pointer cast for buggy MS compiler */ + polarssl_free( (void *) handshake->curves ); #endif #if defined(POLARSSL_X509_CRT_PARSE_C) && \