commit 51bccd388910c30b29cedc20d34df6f7e5216875
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Mar 10 16:09:08 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Mar 10 16:09:08 2015 +0000
tree 45ef2c3acb84ecbaaad1c60f47fde43a2d6e04cc
parent 73ed39d4b1bc2c02ce58d41d7046fa0a7c40a233

Fix compile error with renego disabled

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9f97da7..1a1d0de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
    * 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

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index f3d570c..37853bc 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -602,8 +602,8 @@
      */
 #if defined(POLARSSL_SSL_RENEGOTIATION)
     if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
-    {
 #endif
+    {
         if( ssl->session_negotiate->ticket != NULL &&
                 ssl->session_negotiate->ticket_len != 0 )
         {