yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-30 05:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

mki length feats in a uint16_t

Browse Source 
Signed-off-by: Johan Pascal <johan.pascal@belledonne-communications.com>
This commit is contained in:
Johan Pascal 2020-09-22 15:15:19 +02:00
parent 253d0263a6
commit f6417ecf60
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mbedtls/ssl.h
View File

@ -888,10 +888,10 @@ typedef struct mbedtls_dtls_srtp_info_t
{ {
/*! The SRTP profile that was negotiated. */ /*! The SRTP profile that was negotiated. */
mbedtls_ssl_srtp_profile chosen_dtls_srtp_profile; mbedtls_ssl_srtp_profile chosen_dtls_srtp_profile;
/*! The length of mki_value. */
uint16_t mki_len;
/*! The mki_value used, with max size of 256 bytes. */ /*! The mki_value used, with max size of 256 bytes. */
unsigned char mki_value[MBEDTLS_TLS_SRTP_MAX_MKI_LENGTH]; unsigned char mki_value[MBEDTLS_TLS_SRTP_MAX_MKI_LENGTH];
/*! The length of mki_value. */
size_t mki_len;
} }
mbedtls_dtls_srtp_info; mbedtls_dtls_srtp_info;
@ -3233,7 +3233,7 @@ int mbedtls_ssl_conf_dtls_srtp_protection_profiles
*/ */
int mbedtls_ssl_dtls_srtp_set_mki_value( mbedtls_ssl_context *ssl, int mbedtls_ssl_dtls_srtp_set_mki_value( mbedtls_ssl_context *ssl,
unsigned char *mki_value, unsigned char *mki_value,
size_t mki_len ); uint16_t mki_len );
/** /**
* \brief Get the negotiated DTLS-SRTP Protection Profile. * \brief Get the negotiated DTLS-SRTP Protection Profile.
* This function should be called after the handshake is * This function should be called after the handshake is

9
library/ssl_cli.c
View File

@ -761,10 +761,8 @@ static void ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl,
unsigned char *buf, size_t *olen ) unsigned char *buf, size_t *olen )
{ {
unsigned char *p = buf; unsigned char *p = buf;
size_t protection_profiles_index = 0; size_t protection_profiles_index = 0, ext_len = 0;
size_t mki_len = 0; uint16_t mki_len = 0, profile_value = 0;
size_t ext_len = 0;
uint16_t profile_value = 0;
*olen = 0; *olen = 0;
@ -1843,8 +1841,7 @@ static int ssl_parse_use_srtp_ext( mbedtls_ssl_context *ssl,
* SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1>; * SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1>;
* *
*/ */
if( ssl->conf->dtls_srtp_mki_support == MBEDTLS_SSL_DTLS_SRTP_MKI_SUPPORTED && if( ssl->conf->dtls_srtp_mki_support == MBEDTLS_SSL_DTLS_SRTP_MKI_SUPPORTED )
ssl->dtls_srtp_info.mki_len != 0 )
{ {
mki_len = ssl->dtls_srtp_info.mki_len; mki_len = ssl->dtls_srtp_info.mki_len;
} }

3
library/ssl_srv.c
View File

@ -783,7 +783,8 @@ static int ssl_parse_use_srtp_ext( mbedtls_ssl_context *ssl,
{ {
mbedtls_ssl_srtp_profile client_protection = MBEDTLS_TLS_SRTP_UNSET; mbedtls_ssl_srtp_profile client_protection = MBEDTLS_TLS_SRTP_UNSET;
size_t i,j; size_t i,j;
size_t profile_length,mki_length; size_t profile_length;
uint16_t mki_length;
/*! 2 bytes for profile length and 1 byte for mki len */ /*! 2 bytes for profile length and 1 byte for mki len */
const size_t size_of_lengths = 3; const size_t size_of_lengths = 3;

2
library/ssl_tls.c
View File

@ -4717,7 +4717,7 @@ void mbedtls_ssl_conf_srtp_mki_value_supported( mbedtls_ssl_config *conf,
int mbedtls_ssl_dtls_srtp_set_mki_value( mbedtls_ssl_context *ssl, int mbedtls_ssl_dtls_srtp_set_mki_value( mbedtls_ssl_context *ssl,
unsigned char *mki_value, unsigned char *mki_value,
size_t mki_len ) uint16_t mki_len )
{ {
if ( mki_len > MBEDTLS_TLS_SRTP_MAX_MKI_LENGTH ) if ( mki_len > MBEDTLS_TLS_SRTP_MAX_MKI_LENGTH )
{ {