commit e79c1e812147c95572a5abc887f10058ea88f4fc
author Johan Pascal <johan.pascal@belledonne-communications.com> Tue Sep 22 15:51:27 2020 +0200
committer Johan Pascal <johan.pascal@belledonne-communications.com> Thu Oct 29 01:14:49 2020 +0100
tree 55b26cf25a8b1b745359499fdfc9eee00415b48d
parent a455cd9a473fc80d85df8d4bbbc6c48aab44ad89

style

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

include/mbedtls/config.h

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 7a1a2b1..2b12338 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1817,8 +1817,8 @@
  *
  * Enable support for DTLS-SRTP, RFC5764, use_srtp extension.
  * \note Only the dtls-srtp key material negotiation is supported.
- * Once negotiated, the key should be extracted, and data should be transmitted
- * via an SRTP stack.
+ * Once negotiated, the key should be extracted using mbedtls_ssl_tls_prf()
+ * and data should be transmitted via an SRTP stack.
  *
  * Requires: MBEDTLS_SSL_PROTO_DTLS
  *

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index d0007fc..bae5348 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -3190,13 +3190,13 @@
     switch( profile )
     {
         case MBEDTLS_TLS_SRTP_AES128_CM_HMAC_SHA1_80:
-            return "MBEDTLS_TLS_SRTP_AES128_CM_HMAC_SHA1_80";
+            return( "MBEDTLS_TLS_SRTP_AES128_CM_HMAC_SHA1_80" );
         case MBEDTLS_TLS_SRTP_AES128_CM_HMAC_SHA1_32:
-            return "MBEDTLS_TLS_SRTP_AES128_CM_HMAC_SHA1_32";
+            return( "MBEDTLS_TLS_SRTP_AES128_CM_HMAC_SHA1_32" );
         case MBEDTLS_TLS_SRTP_NULL_HMAC_SHA1_80:
-            return "MBEDTLS_TLS_SRTP_NULL_HMAC_SHA1_80";
+            return( "MBEDTLS_TLS_SRTP_NULL_HMAC_SHA1_80" );
         case MBEDTLS_TLS_SRTP_NULL_HMAC_SHA1_32:
-            return "MBEDTLS_TLS_SRTP_NULL_HMAC_SHA1_32";
+            return( "MBEDTLS_TLS_SRTP_NULL_HMAC_SHA1_32" );
         default: break;
     }
     return( "" );

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 3954768..0eaeefa 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -800,9 +800,9 @@
     *p++ = (unsigned char)( ext_len & 0xFF );
 
     /* protection profile length: 2*(ssl->conf->dtls_srtp_profile_list_len) */
-    *p++ = (unsigned char)( ( ( 2 * (ssl->conf->dtls_srtp_profile_list_len) )
+    *p++ = (unsigned char)( ( ( 2 * ssl->conf->dtls_srtp_profile_list_len )
                               >> 8 ) & 0xFF );
-    *p++ = (unsigned char)( ( 2 * (ssl->conf->dtls_srtp_profile_list_len) )
+    *p++ = (unsigned char)( ( 2 * ssl->conf->dtls_srtp_profile_list_len )
                             & 0xFF );
 
     for( protection_profiles_index=0;
@@ -824,8 +824,11 @@
              * Note: we shall never arrive here as protection profiles
              * is checked by ssl_set_dtls_srtp_protection_profiles function
              */
-            MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, ignore illegal DTLS-SRTP protection profile %d",
-                                        ssl->conf->dtls_srtp_profile_list[protection_profiles_index] ) );
+            MBEDTLS_SSL_DEBUG_MSG( 3,
+                    ( "client hello, "
+                      "ignore illegal DTLS-SRTP protection profile %d",
+                      ssl->conf->dtls_srtp_profile_list[protection_profiles_index]
+                    ) );
         }
     }