commit 8408a94969e202cdabe56ddb5cf66c60a7db1c0f
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Apr 09 12:14:31 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Apr 09 13:52:55 2015 +0200
tree d202f7441cbeced2359910fd9cbb28c2a306459a
parent a687baf1953f5a5d521e593b04a9d3fc3fe704cd

Remove MBEDTLS_ from internal macros

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 8cce276..3dccb43 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1208,7 +1208,7 @@
 #if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER) ||     \
     ( defined(MBEDTLS_CIPHER_MODE_CBC) &&                                  \
       ( defined(MBEDTLS_AES_C) || defined(MBEDTLS_CAMELLIA_C) ) )
-#define MBEDTLS_SOME_MODES_USE_MAC
+#define SSL_SOME_MODES_USE_MAC
 #endif
 
 /*
@@ -1235,7 +1235,7 @@
     /*
      * Add MAC before if needed
      */
-#if defined(MBEDTLS_SOME_MODES_USE_MAC)
+#if defined(SSL_SOME_MODES_USE_MAC)
     if( mode == MBEDTLS_MODE_STREAM ||
         ( mode == MBEDTLS_MODE_CBC
 #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
@@ -1538,14 +1538,14 @@
     return( 0 );
 }
 
-#define MBEDTLS_SSL_MAX_MAC_SIZE   48
+#define SSL_MAX_MAC_SIZE   48
 
 static int ssl_decrypt_buf( mbedtls_ssl_context *ssl )
 {
     size_t i;
     mbedtls_cipher_mode_t mode;
     int auth_done = 0;
-#if defined(MBEDTLS_SOME_MODES_USE_MAC)
+#if defined(SSL_SOME_MODES_USE_MAC)
     size_t padlen = 0, correct = 1;
 #endif
 
@@ -1707,7 +1707,7 @@
 #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
         if( ssl->session_in->encrypt_then_mac == MBEDTLS_SSL_ETM_ENABLED )
         {
-            unsigned char computed_mac[MBEDTLS_SSL_MAX_MAC_SIZE];
+            unsigned char computed_mac[SSL_MAX_MAC_SIZE];
             unsigned char pseudo_hdr[13];
 
             MBEDTLS_SSL_DEBUG_MSG( 3, ( "using encrypt then mac" ) );
@@ -1891,10 +1891,10 @@
      * Authenticate if not done yet.
      * Compute the MAC regardless of the padding result (RFC4346, CBCTIME).
      */
-#if defined(MBEDTLS_SOME_MODES_USE_MAC)
+#if defined(SSL_SOME_MODES_USE_MAC)
     if( auth_done == 0 )
     {
-        unsigned char tmp[MBEDTLS_SSL_MAX_MAC_SIZE];
+        unsigned char tmp[SSL_MAX_MAC_SIZE];
 
         ssl->in_msglen -= ssl->transform_in->maclen;
 
@@ -1976,7 +1976,7 @@
         if( correct == 0 )
             return( MBEDTLS_ERR_SSL_INVALID_MAC );
     }
-#endif /* MBEDTLS_SOME_MODES_USE_MAC */
+#endif /* SSL_SOME_MODES_USE_MAC */
 
     /* Make extra sure authentication was performed, exactly once */
     if( auth_done != 1 )