commit 2f5a1b4e553f0aea23613db2f092bc3a106bcd58
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 09 11:12:32 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 09 13:05:06 2015 +0000
tree 2de8835e05aa9180a6b5ba72b2a7ed21fc455334
parent e7e906de13add2c609e639da135418d4b0a9435f

Rename SSL_RENEGOTIATION macro

- new name is more explicit
- avoids collision with POLARSSL_SSL_RENEGOTIATION config flag when prefixing
  will be applied

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 5e9df52..d474ccd 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3206,7 +3206,7 @@
          * except at the beginning of renegotiations */
         if( ssl->in_msgtype == SSL_MSG_APPLICATION_DATA &&
             ssl->state != SSL_HANDSHAKE_OVER &&
-            ! ( ssl->renegotiation == SSL_RENEGOTIATION &&
+            ! ( ssl->renegotiation == SSL_RENEGOTIATION_IN_PROGRESS &&
                 ssl->state == SSL_SERVER_HELLO ) )
         {
             SSL_DEBUG_MSG( 1, ( "dropping unexpected ApplicationData" ) );
@@ -3942,7 +3942,7 @@
      */
 #if defined(POLARSSL_SSL_RENEGOTIATION) && defined(POLARSSL_SSL_CLI_C)
     if( ssl->endpoint == SSL_IS_CLIENT &&
-        ssl->renegotiation == SSL_RENEGOTIATION )
+        ssl->renegotiation == SSL_RENEGOTIATION_IN_PROGRESS )
     {
         if( ssl->session->peer_cert == NULL )
         {
@@ -4487,7 +4487,7 @@
     SSL_DEBUG_MSG( 3, ( "=> handshake wrapup" ) );
 
 #if defined(POLARSSL_SSL_RENEGOTIATION)
-    if( ssl->renegotiation == SSL_RENEGOTIATION )
+    if( ssl->renegotiation == SSL_RENEGOTIATION_IN_PROGRESS )
     {
         ssl->renegotiation =  SSL_RENEGOTIATION_DONE;
         ssl->renego_records_seen = 0;
@@ -5979,7 +5979,7 @@
 #endif
 
     ssl->state = SSL_HELLO_REQUEST;
-    ssl->renegotiation = SSL_RENEGOTIATION;
+    ssl->renegotiation = SSL_RENEGOTIATION_IN_PROGRESS;
 
     if( ( ret = ssl_handshake( ssl ) ) != 0 )
     {
@@ -6022,7 +6022,7 @@
      * On client, either start the renegotiation process or,
      * if already in progress, continue the handshake
      */
-    if( ssl->renegotiation != SSL_RENEGOTIATION )
+    if( ssl->renegotiation != SSL_RENEGOTIATION_IN_PROGRESS )
     {
         if( ssl->state != SSL_HANDSHAKE_OVER )
             return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );