mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-24 16:35:38 +00:00
Changed x509parse_crt_der() to support adding to chain.
Removed chain functionality from x509parse_crt() as x509parse_crt_der() now handles that much cleaner.
This commit is contained in:
parent
4087c47043
commit
d6d4109adc
|
@ -1129,7 +1129,8 @@ static int x509_get_sig_alg( const x509_buf *sig_oid, int *sig_alg )
|
||||||
/*
|
/*
|
||||||
* Parse and fill a single X.509 certificate in DER format
|
* Parse and fill a single X.509 certificate in DER format
|
||||||
*/
|
*/
|
||||||
int x509parse_crt_der( x509_cert *crt, const unsigned char *buf, size_t buflen )
|
int x509parse_crt_der_core( x509_cert *crt, const unsigned char *buf,
|
||||||
|
size_t buflen )
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
@ -1380,15 +1381,13 @@ int x509parse_crt_der( x509_cert *crt, const unsigned char *buf, size_t buflen )
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Parse one or more PEM certificates from a buffer and add them to the chained list
|
* Parse one X.509 certificate in DER format from a buffer and add them to a
|
||||||
|
* chained list
|
||||||
*/
|
*/
|
||||||
int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
|
int x509parse_crt_der( x509_cert *chain, const unsigned char *buf, size_t buflen )
|
||||||
{
|
{
|
||||||
int ret, success = 0, first_error = 0, total_failed = 0;
|
int ret;
|
||||||
x509_cert *crt, *prev = NULL;
|
x509_cert *crt = chain, *prev = NULL;
|
||||||
int buf_format = X509_FORMAT_DER;
|
|
||||||
|
|
||||||
crt = chain;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check for valid input
|
* Check for valid input
|
||||||
|
@ -1417,6 +1416,34 @@ int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
|
||||||
memset( crt, 0, sizeof( x509_cert ) );
|
memset( crt, 0, sizeof( x509_cert ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( ( ret = x509parse_crt_der_core( crt, buf, buflen ) ) != 0 )
|
||||||
|
{
|
||||||
|
if( prev )
|
||||||
|
prev->next = NULL;
|
||||||
|
|
||||||
|
if( crt != chain )
|
||||||
|
free( crt );
|
||||||
|
|
||||||
|
return( ret );
|
||||||
|
}
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Parse one or more PEM certificates from a buffer and add them to the chained list
|
||||||
|
*/
|
||||||
|
int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
|
||||||
|
{
|
||||||
|
int ret, success = 0, first_error = 0, total_failed = 0;
|
||||||
|
int buf_format = X509_FORMAT_DER;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check for valid input
|
||||||
|
*/
|
||||||
|
if( chain == NULL || buf == NULL )
|
||||||
|
return( POLARSSL_ERR_X509_INVALID_INPUT );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Determine buffer content. Buffer contains either one DER certificate or
|
* Determine buffer content. Buffer contains either one DER certificate or
|
||||||
* one or more PEM certificates.
|
* one or more PEM certificates.
|
||||||
|
@ -1427,7 +1454,7 @@ int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if( buf_format == X509_FORMAT_DER )
|
if( buf_format == X509_FORMAT_DER )
|
||||||
return x509parse_crt_der( crt, buf, buflen );
|
return x509parse_crt_der( chain, buf, buflen );
|
||||||
|
|
||||||
#if defined(POLARSSL_PEM_C)
|
#if defined(POLARSSL_PEM_C)
|
||||||
if( buf_format == X509_FORMAT_PEM )
|
if( buf_format == X509_FORMAT_PEM )
|
||||||
|
@ -1474,61 +1501,30 @@ int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
|
|
||||||
ret = x509parse_crt_der( crt, pem.buf, pem.buflen );
|
ret = x509parse_crt_der( chain, pem.buf, pem.buflen );
|
||||||
|
|
||||||
pem_free( &pem );
|
pem_free( &pem );
|
||||||
|
|
||||||
if( ret != 0 )
|
if( ret != 0 )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* quit parsing on a memory error
|
* Quit parsing on a memory error
|
||||||
*/
|
*/
|
||||||
if( ret == POLARSSL_ERR_X509_MALLOC_FAILED )
|
if( ret == POLARSSL_ERR_X509_MALLOC_FAILED )
|
||||||
{
|
|
||||||
if( prev )
|
|
||||||
prev->next = NULL;
|
|
||||||
|
|
||||||
if( crt != chain )
|
|
||||||
free( crt );
|
|
||||||
|
|
||||||
return( ret );
|
return( ret );
|
||||||
}
|
|
||||||
|
|
||||||
if( first_error == 0 )
|
if( first_error == 0 )
|
||||||
first_error = ret;
|
first_error = ret;
|
||||||
|
|
||||||
total_failed++;
|
total_failed++;
|
||||||
|
|
||||||
memset( crt, 0, sizeof( x509_cert ) );
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
success = 1;
|
success = 1;
|
||||||
|
|
||||||
/*
|
|
||||||
* Add new certificate to the list
|
|
||||||
*/
|
|
||||||
crt->next = (x509_cert *) malloc( sizeof( x509_cert ) );
|
|
||||||
|
|
||||||
if( crt->next == NULL )
|
|
||||||
return( POLARSSL_ERR_X509_MALLOC_FAILED );
|
|
||||||
|
|
||||||
prev = crt;
|
|
||||||
crt = crt->next;
|
|
||||||
memset( crt, 0, sizeof( x509_cert ) );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if( crt->version == 0 )
|
|
||||||
{
|
|
||||||
if( prev )
|
|
||||||
prev->next = NULL;
|
|
||||||
|
|
||||||
if( crt != chain )
|
|
||||||
free( crt );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( success )
|
if( success )
|
||||||
return( total_failed );
|
return( total_failed );
|
||||||
else if( first_error )
|
else if( first_error )
|
||||||
|
|
Loading…
Reference in a new issue