commit ed99d7030903998b4d2e48b9cb5d6bdb6b1f68d0
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 09 11:17:30 2015 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Mar 09 13:05:06 2015 +0000
tree 71910cec9b0079284387ba2b77dde36c5e580bec
parent 2f5a1b4e553f0aea23613db2f092bc3a106bcd58

Rename macro to avoid possible future collision

include/polarssl/ssl.h

diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index ef13164..b4a7085 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -368,7 +368,7 @@
  * Signaling ciphersuite values (SCSV)
  */
 #define SSL_EMPTY_RENEGOTIATION_INFO    0xFF   /**< renegotiation info ext */
-#define SSL_FALLBACK_SCSV               0x5600 /**< draft-ietf-tls-downgrade-scsv-00 */
+#define SSL_FALLBACK_SCSV_VALUE         0x5600 /**< draft-ietf-tls-downgrade-scsv-00 */
 
 /*
  * Supported Signature and Hash algorithms (For TLS 1.2)

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index ab9eeed..9561872 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -736,8 +736,8 @@
     if( ssl->fallback == SSL_IS_FALLBACK )
     {
         SSL_DEBUG_MSG( 3, ( "adding FALLBACK_SCSV" ) );
-        *p++ = (unsigned char)( SSL_FALLBACK_SCSV >> 8 );
-        *p++ = (unsigned char)( SSL_FALLBACK_SCSV      );
+        *p++ = (unsigned char)( SSL_FALLBACK_SCSV_VALUE >> 8 );
+        *p++ = (unsigned char)( SSL_FALLBACK_SCSV_VALUE      );
         n++;
     }
 #endif

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 499fe06..ebae272 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1209,8 +1209,8 @@
     for( i = 0, p = buf + 6; i < ciph_len; i += 3, p += 3 )
     {
         if( p[0] == 0 &&
-            p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV >> 8 ) & 0xff ) &&
-            p[2] == (unsigned char)( ( SSL_FALLBACK_SCSV      ) & 0xff ) )
+            p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE >> 8 ) & 0xff ) &&
+            p[2] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE      ) & 0xff ) )
         {
             SSL_DEBUG_MSG( 3, ( "received FALLBACK_SCSV" ) );
 
@@ -1913,8 +1913,8 @@
 #if defined(POLARSSL_SSL_FALLBACK_SCSV)
     for( i = 0, p = buf + 41 + sess_len; i < ciph_len; i += 2, p += 2 )
     {
-        if( p[0] == (unsigned char)( ( SSL_FALLBACK_SCSV >> 8 ) & 0xff ) &&
-            p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV      ) & 0xff ) )
+        if( p[0] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE >> 8 ) & 0xff ) &&
+            p[1] == (unsigned char)( ( SSL_FALLBACK_SCSV_VALUE      ) & 0xff ) )
         {
             SSL_DEBUG_MSG( 0, ( "received FALLBACK_SCSV" ) );