commit ec1c22294781cb1e43f87990f7399ff91e3c2e04
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Wed Jun 12 10:18:26 2019 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Wed Jun 12 10:18:26 2019 +0200
tree b3cdf85ba53120a8b50bebc7a2173f73ba0aee49
parent 8794a4290d6da9704d840e0e3795d7ce67d82db2

Fix a few style issues

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index fccf104..b3677b5 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -566,7 +566,7 @@
 #endif
 
 #if defined(MBEDTLS_SSL_TLS_C) && \
-    (!defined(MBEDTLS_SSL_PROTO_TLS) && !defined(MBEDTLS_SSL_PROTO_DTLS))
+    ( !defined(MBEDTLS_SSL_PROTO_TLS) && !defined(MBEDTLS_SSL_PROTO_DTLS) )
 #error "MBEDTLS_SSL_TLS_C defined, but neither TLS or DTLS is active"
 #endif
 

include/mbedtls/config.h

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 96cc986..e0b5ba4 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1525,7 +1525,7 @@
  * Enable this and MBEDTLS_SSL_PROTO_TLS1_2 to enable TLS 1.2;
  * enable this and MBEDTLS_SSL_PROTO_TLS1_1 to enable TLS 1.1;
  * enable this and MBEDTLS_SSL_PROTO_TLS1   to enable TLS 1.0;
- * and/or this and MBEDTLS_SSL_PROTO_SSL3 to enable SSL 3.0 (deprecated).
+ * and/or this and MBEDTLS_SSL_PROTO_SSL3   to enable SSL 3.0 (deprecated).
  *
  * \see MBEDTLS_SSL_PROTO_DTLS
  *

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 511715f..1c8709f 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -270,7 +270,7 @@
  * Goals for these helpers:
  *  - generate minimal code, eg don't test if mode is DTLS in a DTLS-only build
  *  - make the flow clear to the compiler, so that in TLS and DTLS combined
- *  builds, when there are two branches, it knows exactly one of them is taken
+ *    builds, when there are two branches, it knows exactly one of them is taken
  *  - preserve readability
  *
  * There are three macros:

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index fda0324..a8fd49b 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1663,7 +1663,7 @@
     {
         ciph_offset = 35 + sess_len;
     }
-#endif
+#endif /* MBEDTLS_SSL_PROTO_TLS */
 
     ciph_len = ( buf[ciph_offset + 0] << 8 )
              | ( buf[ciph_offset + 1]      );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index dbfcde2..e3ce590 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4216,7 +4216,7 @@
             return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
         }
     }
-#endif
+#endif /* MBEDTLS_SSL_PROTO_TLS */
 
     return( 0 );
 }
@@ -10847,7 +10847,7 @@
         *major = ver[0];
         *minor = ver[1];
     }
-#endif
+#endif /* MBEDTLS_SSL_PROTO_TLS */
 }
 
 int mbedtls_ssl_set_calc_verify_md( mbedtls_ssl_context *ssl, int md )