diff --git a/ChangeLog b/ChangeLog index 9f97da75f..1a1d0de15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ Bugfix * Fix potential unintended sign extension in asn1_get_len() on 64-bit platforms. * Fix potential memory leak in ssl_set_psk() (found by Mansour Moufid). + * Fix compile error when POLARSSL_SSL_DISABLE_RENEGOTATION and + POLARSSL_SSL_SSESSION_TICKETS where both enabled in config.h (introduced + in 1.3.10). Changes * ssl_set_own_cert() now longers calls pk_check_pair() since the diff --git a/library/ssl_cli.c b/library/ssl_cli.c index f3d570ccb..37853bc60 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -602,8 +602,8 @@ static int ssl_write_client_hello( ssl_context *ssl ) */ #if defined(POLARSSL_SSL_RENEGOTIATION) if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE ) - { #endif + { if( ssl->session_negotiate->ticket != NULL && ssl->session_negotiate->ticket_len != 0 ) {