yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-09 22:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix return convention of x509_wildcard_verify()

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-23 09:24:29 +02:00
parent 07894338a0
commit b80d16d171
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
library/x509_crt.c
View file

@ -1705,10 +1705,9 @@ static int x509_memcasecmp( const void *s1, const void *s2, size_t len )
} }
/* /*
* Return 1 if match, 0 if not * Return 0 if name matches wildcard, -1 otherwise
* TODO: inverted return value!
*/ */
static int x509_wildcard_verify( const char *cn, mbedtls_x509_buf *name ) static int x509_check_wildcard( const char *cn, mbedtls_x509_buf *name )
{ {
size_t i; size_t i;
size_t cn_idx = 0, cn_len = strlen( cn ); size_t cn_idx = 0, cn_len = strlen( cn );
@ -1726,15 +1725,15 @@ static int x509_wildcard_verify( const char *cn, mbedtls_x509_buf *name )
} }
if( cn_idx == 0 ) if( cn_idx == 0 )
return( 0 ); return( -1 );
if( cn_len - cn_idx == name->len - 1 && if( cn_len - cn_idx == name->len - 1 &&
x509_memcasecmp( name->p + 1, cn + cn_idx, name->len - 1 ) == 0 ) x509_memcasecmp( name->p + 1, cn + cn_idx, name->len - 1 ) == 0 )
{ {
return( 1 ); return( 0 );
} }
return( 0 ); return( -1 );
} }
/* /*
@ -2133,8 +2132,10 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
if( cur->buf.len > 2 && if( cur->buf.len > 2 &&
memcmp( cur->buf.p, "*.", 2 ) == 0 && memcmp( cur->buf.p, "*.", 2 ) == 0 &&
x509_wildcard_verify( cn, &cur->buf ) ) x509_check_wildcard( cn, &cur->buf ) == 0 )
{
break; break;
}
cur = cur->next; cur = cur->next;
} }
@ -2154,7 +2155,7 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
if( name->val.len > 2 && if( name->val.len > 2 &&
memcmp( name->val.p, "*.", 2 ) == 0 && memcmp( name->val.p, "*.", 2 ) == 0 &&
x509_wildcard_verify( cn, &name->val ) ) x509_check_wildcard( cn, &name->val ) == 0 )
break; break;
} }