yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-10-07 06:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

x509: factor common code to a function

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2016-01-28 17:48:19 +01:00
parent 187ba489af
commit 80c8786bfc
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
library/x509_crt.c
View file

@ -1796,16 +1796,26 @@ static int x509_memcasecmp( const void *s1, const void *s2, size_t len )
} }
/* /*
* Return 0 if name matches wildcard, -1 otherwise * Return 0 if names matche as DNS names (inc. wildcard),
* -1 otherwise
*/ */
static int x509_check_wildcard( const char *exp_name, static int x509_check_dns_name( const char *exp_name,
size_t exp_len,
const mbedtls_x509_buf *name ) const mbedtls_x509_buf *name )
{ {
size_t i; size_t i;
size_t idx = 0, exp_len = strlen( exp_name ); size_t idx = 0;
if( name->len < 3 || name->p[0] != '*' || name->p[1] != '.' ) /* First check if the names are equal */
if( name->len == exp_len &&
x509_memcasecmp( exp_name, name->p, exp_len ) == 0 )
{
return( 0 ); return( 0 );
}
/* Now try a wildcard match */
if( name->len < 3 || name->p[0] != '*' || name->p[1] != '.' )
return( -1 );
for( i = 0; i < exp_len; ++i ) for( i = 0; i < exp_len; ++i )
{ {
@ -2233,18 +2243,8 @@ static int x509_crt_verify_name( const mbedtls_x509_crt *crt,
while( cur != NULL ) while( cur != NULL )
{ {
if( cur->buf.len == exp_len && if( x509_check_dns_name( exp_name, exp_len, &cur->buf ) == 0 )
x509_memcasecmp( exp_name, cur->buf.p, exp_len ) == 0 )
{
return( 0 ); return( 0 );
}
if( cur->buf.len > 2 &&
memcmp( cur->buf.p, "*.", 2 ) == 0 &&
x509_check_wildcard( exp_name, &cur->buf ) == 0 )
{
return( 0 );
}
cur = cur->next; cur = cur->next;
} }
@ -2257,18 +2257,8 @@ static int x509_crt_verify_name( const mbedtls_x509_crt *crt,
{ {
if( MBEDTLS_OID_CMP( MBEDTLS_OID_AT_CN, &name->oid ) == 0 ) if( MBEDTLS_OID_CMP( MBEDTLS_OID_AT_CN, &name->oid ) == 0 )
{ {
if( name->val.len == exp_len && if( x509_check_dns_name( exp_name, exp_len, &name->val ) == 0 )
x509_memcasecmp( name->val.p, exp_name, exp_len ) == 0 )
{
return( 0 ); return( 0 );
}
if( name->val.len > 2 &&
memcmp( name->val.p, "*.", 2 ) == 0 &&
x509_check_wildcard( exp_name, &name->val ) == 0 )
{
return( 0 );
}
} }
name = name->next; name = name->next;