commit d576fdb1d63a3e2b315362710d08b5439747a9a6
author Johan Pascal <johan.pascal@belledonne-communications.com> Tue Sep 22 10:39:53 2020 +0200
committer Johan Pascal <johan.pascal@belledonne-communications.com> Thu Oct 29 01:14:49 2020 +0100
tree f032a0bee5e65dc9bd04c24216141975dd7c9f6f
parent 9bc97ca19d388ae0e155ba6302787acd2bcd4c36

Style + fix bound check in write_use_srt_ext

Signed-off-by: Johan Pascal <johan.pascal@belledonne-communications.com>

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 6dc219b..e151ffe 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2063,6 +2063,7 @@
 #if defined(MBEDTLS_SSL_DTLS_SRTP)
             case MBEDTLS_TLS_EXT_USE_SRTP:
                 MBEDTLS_SSL_DEBUG_MSG( 3, ( "found use_srtp extension" ) );
+
                 ret = ssl_parse_use_srtp_ext( ssl, ext + 4, ext_size );
                 if ( ret != 0 )
                     return( ret );
@@ -2645,8 +2646,7 @@
 
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding use_srtp extension" ) );
 
-    if( ssl->conf->dtls_srtp_mki_support == MBEDTLS_SSL_DTLS_SRTP_MKI_SUPPORTED &&
-        ssl->dtls_srtp_info.mki_len != 0 )
+    if( ssl->conf->dtls_srtp_mki_support == MBEDTLS_SSL_DTLS_SRTP_MKI_SUPPORTED )
     {
         mki_len = ssl->dtls_srtp_info.mki_len;
     }
@@ -2659,7 +2659,7 @@
      * - 1 byte for the mki length
      * +  the actual mki length
      * Check we have enough room in the output buffer */
-    if( end < buf + mki_len + 9 )
+    if( (size_t)( end - buf ) < mki_len + 9 )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) );
         return;
@@ -2679,7 +2679,8 @@
     /* protection profile length: 2 */
     buf[4] = 0x00;
     buf[5] = 0x02;
-    profile_value = mbedtls_ssl_get_srtp_profile_iana_value( ssl->dtls_srtp_info.chosen_dtls_srtp_profile );
+    profile_value = mbedtls_ssl_get_srtp_profile_iana_value(
+                                ssl->dtls_srtp_info.chosen_dtls_srtp_profile );
     if( profile_value != 0xFFFF )
     {
         buf[6] = (unsigned char)( ( profile_value >> 8 ) & 0xFF );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 93b60cc..696eb85 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4751,12 +4751,12 @@
 {
     if ( mki_len > MBEDTLS_TLS_SRTP_MAX_MKI_LENGTH )
     {
-        return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
     }
 
     if( ssl->conf->dtls_srtp_mki_support == MBEDTLS_SSL_DTLS_SRTP_MKI_UNSUPPORTED )
     {
-        return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
+        return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
     }
 
     memcpy( ssl->dtls_srtp_info.mki_value, mki_value, mki_len );
@@ -4779,8 +4779,10 @@
     }
 
 
-    for( i=0; i < profiles_number; i++ ) {
-        switch( profiles[i] ) {
+    for( i=0; i < profiles_number; i++ )
+    {
+        switch( profiles[i] )
+        {
             case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_80:
             case MBEDTLS_SRTP_AES128_CM_HMAC_SHA1_32:
             case MBEDTLS_SRTP_NULL_HMAC_SHA1_80: