yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-22 13:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3965 from bensze01/use_after_scope

Browse source 
Fix use-after-scope error in programs/ssl
This commit is contained in:
Manuel Pégourié-Gonnard 2020-12-29 15:26:08 +01:00 committed by GitHub
parent 3c537fedfd 0bd9d226bc
commit e9e0388934
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.d/programs-ssl-use-after-scope.txt Normal file
View file

@ -0,0 +1,2 @@
Bugfix
* Fix use-after-scope error in programs/ssl/ssl_client2.c and ssl_server2.c

4
programs/ssl/ssl_client2.c
View file

@ -2339,12 +2339,12 @@ int main( int argc, char *argv[] )
#endif #endif
#if defined(MBEDTLS_SSL_DTLS_SRTP) #if defined(MBEDTLS_SSL_DTLS_SRTP)
const mbedtls_ssl_srtp_profile forced_profile[] =
{ opt.force_srtp_profile, MBEDTLS_TLS_SRTP_UNSET };
if( opt.use_srtp == 1 ) if( opt.use_srtp == 1 )
{ {
if( opt.force_srtp_profile != 0 ) if( opt.force_srtp_profile != 0 )
{ {
const mbedtls_ssl_srtp_profile forced_profile[] =
{ opt.force_srtp_profile, MBEDTLS_TLS_SRTP_UNSET };
ret = mbedtls_ssl_conf_dtls_srtp_protection_profiles ( &conf, forced_profile ); ret = mbedtls_ssl_conf_dtls_srtp_protection_profiles ( &conf, forced_profile );
} }
else else

2
programs/ssl/ssl_server2.c
View file

@ -3151,11 +3151,11 @@ int main( int argc, char *argv[] )
#endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */ #endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
#if defined(MBEDTLS_SSL_DTLS_SRTP) #if defined(MBEDTLS_SSL_DTLS_SRTP)
const mbedtls_ssl_srtp_profile forced_profile[] = { opt.force_srtp_profile, MBEDTLS_TLS_SRTP_UNSET };
if( opt.use_srtp == 1 ) if( opt.use_srtp == 1 )
{ {
if( opt.force_srtp_profile != 0 ) if( opt.force_srtp_profile != 0 )
{ {
const mbedtls_ssl_srtp_profile forced_profile[] = { opt.force_srtp_profile, MBEDTLS_TLS_SRTP_UNSET };
ret = mbedtls_ssl_conf_dtls_srtp_protection_profiles( &conf, forced_profile ); ret = mbedtls_ssl_conf_dtls_srtp_protection_profiles( &conf, forced_profile );
} }
else else