yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 22:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/1819' into mbedtls-2.7

Browse source
This commit is contained in:
Simon Butcher 2018-07-10 11:36:14 +01:00
parent 41c23b5a49 2120ef85c7
commit db060a8da2
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -3,6 +3,8 @@ mbed TLS ChangeLog (Sorted per branch, date)
= mbed TLS x.x.x branch released xxxx-xx-xx = mbed TLS x.x.x branch released xxxx-xx-xx
Bugfix Bugfix
* Fix compilation error on C++, because of a variable named new.
Found and fixed by Hirotaka Niisato in #1783.
* Change the shebang line in Perl scripts to look up perl in the PATH. * Change the shebang line in Perl scripts to look up perl in the PATH.
Contributed by fbrosson in #1533. Contributed by fbrosson in #1533.
* Fix a memory leak in mbedtls_x509_csr_parse(), found by catenacyber, * Fix a memory leak in mbedtls_x509_csr_parse(), found by catenacyber,

16
library/ssl_tls.c
View file

@ -6017,27 +6017,27 @@ static int ssl_append_key_cert( mbedtls_ssl_key_cert **head,
mbedtls_x509_crt *cert, mbedtls_x509_crt *cert,
mbedtls_pk_context *key ) mbedtls_pk_context *key )
{ {
mbedtls_ssl_key_cert *new; mbedtls_ssl_key_cert *new_cert;
new = mbedtls_calloc( 1, sizeof( mbedtls_ssl_key_cert ) ); new_cert = mbedtls_calloc( 1, sizeof( mbedtls_ssl_key_cert ) );
if( new == NULL ) if( new_cert == NULL )
return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
new->cert = cert; new_cert->cert = cert;
new->key = key; new_cert->key = key;
new->next = NULL; new_cert->next = NULL;
/* Update head is the list was null, else add to the end */ /* Update head is the list was null, else add to the end */
if( *head == NULL ) if( *head == NULL )
{ {
*head = new; *head = new_cert;
} }
else else
{ {
mbedtls_ssl_key_cert *cur = *head; mbedtls_ssl_key_cert *cur = *head;
while( cur->next != NULL ) while( cur->next != NULL )
cur = cur->next; cur = cur->next;
cur->next = new; cur->next = new_cert;
} }
return( 0 ); return( 0 );