yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-08-04 15:31:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic for issuer/subject ID parsing

Browse source
This commit is contained in:
Hanno Becker 2019-06-07 12:04:39 +01:00
parent fd64f14ef9
commit e908412a35
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/x509_crt.c
View file

@ -696,15 +696,13 @@ static int x509_get_dates( unsigned char **p,
*/ */
static int x509_get_uid( unsigned char **p, static int x509_get_uid( unsigned char **p,
const unsigned char *end, const unsigned char *end,
mbedtls_x509_buf *uid, int n ) mbedtls_x509_buf_raw *uid, int n )
{ {
int ret; int ret;
if( *p == end ) if( *p == end )
return( 0 ); return( 0 );
uid->tag = **p;
if( ( ret = mbedtls_asn1_get_tag( p, end, &uid->len, if( ( ret = mbedtls_asn1_get_tag( p, end, &uid->len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | n ) ) != 0 ) MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | n ) ) != 0 )
{ {
@ -1303,25 +1301,17 @@ static int x509_crt_parse_frame( unsigned char *start,
* issuerUniqueID [1] IMPLICIT UniqueIdentifier OPTIONAL, * issuerUniqueID [1] IMPLICIT UniqueIdentifier OPTIONAL,
* -- If present, version shall be v2 or v3 * -- If present, version shall be v2 or v3
*/ */
ret = x509_get_uid( &p, end, &frame->issuer_id, 1 /* implicit tag */ );
ret = x509_get_uid( &p, end, &tmp, 1 /* implicit tag */ );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
frame->issuer_id.p = tmp.p;
frame->issuer_id.len = tmp.len;
/* /*
* subjectUniqueID [2] IMPLICIT UniqueIdentifier OPTIONAL, * subjectUniqueID [2] IMPLICIT UniqueIdentifier OPTIONAL,
* -- If present, version shall be v2 or v3 * -- If present, version shall be v2 or v3
*/ */
ret = x509_get_uid( &p, end, &frame->subject_id, 2 /* implicit tag */ );
ret = x509_get_uid( &p, end, &tmp, 2 /* implicit tag */ );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
frame->subject_id.p = tmp.p;
frame->subject_id.len = tmp.len;
} }
/* /*