yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-19 21:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce helper functions to free X.509 names and sequences

Browse source 
`mbedtls_x509_name` and `mbedtls_x509_sequence` are dynamically allocated
linked lists that need a loop to free properly. Introduce a static helper
function to do that and use it in `mbedtls_x509_crt_free()`, where the
CRT's issuer and subject names (of type `mbedtls_x509_name`) and the
SubjectAlternativeName and ExtendedKeyUsage extensions (of type
`mbedtls_x509_sequence`) need freeing. Increases code-clarity and saves
a few bytes of flash.
This commit is contained in:
Hanno Becker 2019-02-15 17:15:53 +00:00
parent 393338ca78
commit cd03bb2048
1 changed files with 27 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
library/x509_crt.c
View file

@ -2641,14 +2641,33 @@ void mbedtls_x509_crt_init( mbedtls_x509_crt *crt )
/* /*
* Unallocate all certificate data * Unallocate all certificate data
*/ */
static void x509_free_sequence( mbedtls_x509_sequence *seq )
{
while( seq != NULL )
{
mbedtls_x509_sequence *next = seq->next;
mbedtls_platform_zeroize( seq, sizeof( *seq ) );
mbedtls_free( seq );
seq = next;
}
}
static void x509_free_name( mbedtls_x509_name *name )
{
while( name != NULL )
{
mbedtls_x509_name *next = name->next;
mbedtls_platform_zeroize( name, sizeof( *name ) );
mbedtls_free( name );
name = next;
}
}
void mbedtls_x509_crt_free( mbedtls_x509_crt *crt ) void mbedtls_x509_crt_free( mbedtls_x509_crt *crt )
{ {
mbedtls_x509_crt *cert_cur = crt; mbedtls_x509_crt *cert_cur = crt;
mbedtls_x509_crt *cert_prv; mbedtls_x509_crt *cert_prv;
mbedtls_x509_name *name_cur;
mbedtls_x509_name *name_prv;
mbedtls_x509_sequence *seq_cur;
mbedtls_x509_sequence *seq_prv;
if( crt == NULL ) if( crt == NULL )
return; return;
@ -2661,43 +2680,10 @@ void mbedtls_x509_crt_free( mbedtls_x509_crt *crt )
mbedtls_free( cert_cur->sig_opts ); mbedtls_free( cert_cur->sig_opts );
#endif #endif
name_cur = cert_cur->issuer.next; x509_free_name( cert_cur->issuer.next );
while( name_cur != NULL ) x509_free_name( cert_cur->subject.next );
{ x509_free_sequence( cert_cur->ext_key_usage.next );
name_prv = name_cur; x509_free_sequence( cert_cur->subject_alt_names.next );
name_cur = name_cur->next;
mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
mbedtls_free( name_prv );
}
name_cur = cert_cur->subject.next;
while( name_cur != NULL )
{
name_prv = name_cur;
name_cur = name_cur->next;
mbedtls_platform_zeroize( name_prv, sizeof( mbedtls_x509_name ) );
mbedtls_free( name_prv );
}
seq_cur = cert_cur->ext_key_usage.next;
while( seq_cur != NULL )
{
seq_prv = seq_cur;
seq_cur = seq_cur->next;
mbedtls_platform_zeroize( seq_prv,
sizeof( mbedtls_x509_sequence ) );
mbedtls_free( seq_prv );
}
seq_cur = cert_cur->subject_alt_names.next;
while( seq_cur != NULL )
{
seq_prv = seq_cur;
seq_cur = seq_cur->next;
mbedtls_platform_zeroize( seq_prv,
sizeof( mbedtls_x509_sequence ) );
mbedtls_free( seq_prv );
}
if( cert_cur->raw.p != NULL && cert_cur->own_buffer ) if( cert_cur->raw.p != NULL && cert_cur->own_buffer )
{ {