yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-25 04:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integration of bugfix for #626

Browse source 
Adds check for validity of date in x509_get_time() back in, as it was
lost in the merge.
This commit is contained in:
Simon Butcher 2016-10-17 22:32:47 +01:00
parent 2261f198ee
commit 2d0ffbbdc7
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/x509.c
View file

@ -621,21 +621,27 @@ int x509_get_time( unsigned char **p, const unsigned char *end,
{ {
(*p)++; (*p)++;
ret = asn1_get_len( p, end, &len ); ret = asn1_get_len( p, end, &len );
if( ret != 0 ) if( ret != 0 )
return( POLARSSL_ERR_X509_INVALID_DATE + ret ); return( POLARSSL_ERR_X509_INVALID_DATE + ret );
return x509_parse_time( p, len, 2, time ); CHECK( x509_parse_time( p, len, 2, time ) );
CHECK( x509_date_is_valid( time ) );
return( 0 );
} }
else if( tag == ASN1_GENERALIZED_TIME ) else if( tag == ASN1_GENERALIZED_TIME )
{ {
(*p)++; (*p)++;
ret = asn1_get_len( p, end, &len ); ret = asn1_get_len( p, end, &len );
if( ret != 0 ) if( ret != 0 )
return( POLARSSL_ERR_X509_INVALID_DATE + ret ); return( POLARSSL_ERR_X509_INVALID_DATE + ret );
return x509_parse_time( p, len, 4, time ); CHECK( x509_parse_time( p, len, 4, time ) );
CHECK( x509_date_is_valid( time ) );
return( 0 );
} }
else else
return( POLARSSL_ERR_X509_INVALID_DATE + return( POLARSSL_ERR_X509_INVALID_DATE +