Fix compile error with renego disabled

This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-10 16:09:08 +00:00
parent 73ed39d4b1
commit 51bccd3889
2 changed files with 4 additions and 1 deletions

View file

@ -25,6 +25,9 @@ Bugfix
* Fix potential unintended sign extension in asn1_get_len() on 64-bit * Fix potential unintended sign extension in asn1_get_len() on 64-bit
platforms. platforms.
* Fix potential memory leak in ssl_set_psk() (found by Mansour Moufid). * 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 Changes
* ssl_set_own_cert() now longers calls pk_check_pair() since the * ssl_set_own_cert() now longers calls pk_check_pair() since the

View file

@ -602,8 +602,8 @@ static int ssl_write_client_hello( ssl_context *ssl )
*/ */
#if defined(POLARSSL_SSL_RENEGOTIATION) #if defined(POLARSSL_SSL_RENEGOTIATION)
if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE ) if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
{
#endif #endif
{
if( ssl->session_negotiate->ticket != NULL && if( ssl->session_negotiate->ticket != NULL &&
ssl->session_negotiate->ticket_len != 0 ) ssl->session_negotiate->ticket_len != 0 )
{ {