mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-24 16:25:32 +00:00
Fix integration of bugfix for #626
Adds check for validity of date in x509_get_time() back in, as it was lost in the merge.
This commit is contained in:
parent
2261f198ee
commit
2d0ffbbdc7
|
@ -621,21 +621,27 @@ int x509_get_time( unsigned char **p, const unsigned char *end,
|
|||
{
|
||||
(*p)++;
|
||||
ret = asn1_get_len( p, end, &len );
|
||||
|
||||
if( ret != 0 )
|
||||
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 )
|
||||
{
|
||||
(*p)++;
|
||||
ret = asn1_get_len( p, end, &len );
|
||||
|
||||
if( ret != 0 )
|
||||
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
|
||||
return( POLARSSL_ERR_X509_INVALID_DATE +
|
||||
|
|
Loading…
Reference in a new issue