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

Merge pull request #2963 from jiblime/zlib-fix into development

Browse source
This commit is contained in:
Janos Follath 2020-01-30 16:15:16 +00:00
parent 79ef1d4e55 80fcacebdb
commit b719d4bede
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -6,6 +6,8 @@ Bugfix
* Allow loading symlinked certificates. Fixes #3005. Reported and fixed * Allow loading symlinked certificates. Fixes #3005. Reported and fixed
by Jonathan Bennett <JBennett@incomsystems.biz> via #3008. by Jonathan Bennett <JBennett@incomsystems.biz> via #3008.
* Fix an unchecked call to mbedtls_md() in the x509write module. * Fix an unchecked call to mbedtls_md() in the x509write module.
* Fix build failure with MBEDTLS_ZLIB_SUPPORT enabled. Reported by
Jack Lloyd in #2859. Fix submitted by jiblime in #2963.
= mbed TLS 2.20.0 branch released 2020-01-15 = mbed TLS 2.20.0 branch released 2020-01-15

2
library/ssl_tls.c
View file

@ -1880,7 +1880,7 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
/* Allocate compression buffer */ /* Allocate compression buffer */
#if defined(MBEDTLS_ZLIB_SUPPORT) #if defined(MBEDTLS_ZLIB_SUPPORT)
if( session->compression == MBEDTLS_SSL_COMPRESS_DEFLATE && if( ssl->session_negotiate->compression == MBEDTLS_SSL_COMPRESS_DEFLATE &&
ssl->compress_buf == NULL ) ssl->compress_buf == NULL )
{ {
MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "Allocating compression buffer" ) );