From 75870ec6a7ad82a60a0faceeb4f2aca321e28cec Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Thu, 6 Dec 2018 17:31:55 +0200 Subject: [PATCH] Change byte copy to memcpy Change setting the mki value byte after byte with `memcpy()`. Signed-off-by: Johan Pascal --- library/ssl_cli.c | 7 ++----- library/ssl_srv.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 261fb2f83a..a6940f994e 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -762,7 +762,7 @@ static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl, { unsigned char *p = buf; size_t protection_profiles_index = 0; - size_t mki_len = 0, i; + size_t mki_len = 0; size_t ext_len = 0; uint16_t profile_value = 0; @@ -836,10 +836,7 @@ static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl, if( mki_len != 0 ) { - for( i=0; i < mki_len; i++ ) - { - *p++ = ssl->dtls_srtp_info.mki_value[i]; - } + memcpy( p, ssl->dtls_srtp_info.mki_value, mki_len ); MBEDTLS_SSL_DEBUG_BUF( 3, "sending mki", ssl->dtls_srtp_info.mki_value, ssl->dtls_srtp_info.mki_len ); } diff --git a/library/ssl_srv.c b/library/ssl_srv.c index fa1c94c7cd..38cdd91a2d 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c @@ -2606,7 +2606,7 @@ static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl, unsigned char *buf, size_t *olen ) { - size_t mki_len = 0, ext_len = 0, i; + size_t mki_len = 0, ext_len = 0; uint16_t profile_value = 0; if( ssl->dtls_srtp_info.chosen_dtls_srtp_profile == MBEDTLS_SRTP_UNSET_PROFILE ) @@ -2650,10 +2650,7 @@ static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl, } buf[8] = mki_len & 0xFF; - for( i=0; i < mki_len; i++ ) - { - buf[9 + i] = ssl->dtls_srtp_info.mki_value[i]; - } + memcpy( &buf[9], ssl->dtls_srtp_info.mki_value, mki_len ); *olen = 9 + mki_len; }