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>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 6adaf92..d727ebc 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -2608,7 +2608,7 @@
 #endif
 
 #if defined(MBEDTLS_SSL_DTLS_SRTP)
-    if( opt.use_srtp != DFL_USE_SRTP && strlen( opt.mki ) != 0 )
+    if( opt.use_srtp != 0 && strlen( opt.mki ) != 0 )
     {
         if( mbedtls_test_unhexify( mki, sizeof( mki ),
                                    opt.mki,&mki_len ) != 0 )
@@ -2754,11 +2754,11 @@
     {
         size_t j = 0;
 
-        if( (mbedtls_ssl_get_dtls_srtp_protection_profile( &ssl )
-             == MBEDTLS_SRTP_UNSET_PROFILE ) )
+        if( ( mbedtls_ssl_get_dtls_srtp_protection_profile( &ssl )
+                                == MBEDTLS_SRTP_UNSET_PROFILE ) )
         {
-            mbedtls_printf( "    DTLS-SRTP unable to negotiate "
-                            "protection profile\n" );
+            mbedtls_printf( "    Unable to negotiate "
+                            "the use of DTLS-SRTP\n" );
         }
         else
         {
@@ -2781,11 +2781,11 @@
             for( j = 0; j < sizeof( dtls_srtp_key_material ); j++ )
             {
                 if( j % 8 == 0 )
-                    mbedtls_printf("\n    ");
-                mbedtls_printf("%02x ", dtls_srtp_key_material[j] );
+                    mbedtls_printf( "\n    " );
+                mbedtls_printf( "%02x ", dtls_srtp_key_material[j] );
             }
 
-            mbedtls_printf("\n");
+            mbedtls_printf( "\n" );
         }
     }
 #endif /* MBEDTLS_SSL_DTLS_SRTP */

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 350d8ca..6dc7832 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -3863,11 +3863,11 @@
     {
         size_t j = 0;
 
-        if( (mbedtls_ssl_get_dtls_srtp_protection_profile( &ssl )
-             == MBEDTLS_SRTP_UNSET_PROFILE ) )
+        if( ( mbedtls_ssl_get_dtls_srtp_protection_profile( &ssl )
+                                == MBEDTLS_SRTP_UNSET_PROFILE ) )
         {
-            mbedtls_printf( "    DTLS-SRTP unable to negotiate "
-                            "protection profile\n" );
+            mbedtls_printf( "    Unable to negotiate "
+                            "the use of DTLS-SRTP\n" );
         }
         else
         {
@@ -3890,11 +3890,11 @@
             for( j = 0; j < sizeof( dtls_srtp_key_material ); j++ )
             {
                 if( j % 8 == 0 )
-                    mbedtls_printf("\n    ");
-                mbedtls_printf("%02x ", dtls_srtp_key_material[j] );
+                    mbedtls_printf( "\n    " );
+                mbedtls_printf( "%02x ", dtls_srtp_key_material[j] );
             }
 
-            mbedtls_printf("\n");
+            mbedtls_printf( "\n" );
         }
     }
 #endif /* MBEDTLS_SSL_DTLS_SRTP */