ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-11 01:11:42 +08:00
Code Issues Releases Wiki Activity

Split x509_csr_parse_der() out of x509_csr_parse()

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-06-16 18:06:48 +02:00
parent 15f58a86f7
commit f3b47243df
3 changed files with 69 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/polarssl/x509_csr.h
View File

@ -85,7 +85,19 @@ x509write_csr;
#if defined(POLARSSL_X509_CSR_PARSE_C) #if defined(POLARSSL_X509_CSR_PARSE_C)
/** /**
* \brief Load a Certificate Signing Request (CSR) * \brief Load a Certificate Signing Request (CSR) in DER format
*
* \param csr CSR context to fill
* \param buf buffer holding the CRL data
* \param buflen size of the buffer
*
* \return 0 if successful, or a specific X509 error code
*/
int x509_csr_parse_der( x509_csr *csr,
const unsigned char *buf, size_t buflen );
/**
* \brief Load a Certificate Signing Request (CSR), DER or PEM format
* *
* \param csr CSR context to fill * \param csr CSR context to fill
* \param buf buffer holding the CRL data * \param buf buffer holding the CRL data

82
library/x509_csr.c
View File

@ -90,18 +90,15 @@ static int x509_csr_get_version( unsigned char **p,
} }
/* /*
* Parse a CSR * Parse a CSR in DER format
*/ */
int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen ) int x509_csr_parse_der( x509_csr *csr,
const unsigned char *buf, size_t buflen )
{ {
int ret; int ret;
size_t len; size_t len;
unsigned char *p, *end; unsigned char *p, *end;
x509_buf sig_params; x509_buf sig_params;
#if defined(POLARSSL_PEM_PARSE_C)
size_t use_len;
pem_context pem;
#endif
memset( &sig_params, 0, sizeof( x509_buf ) ); memset( &sig_params, 0, sizeof( x509_buf ) );
@ -113,33 +110,8 @@ int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
x509_csr_init( csr ); x509_csr_init( csr );
#if defined(POLARSSL_PEM_PARSE_C)
pem_init( &pem );
ret = pem_read_buffer( &pem,
"-----BEGIN CERTIFICATE REQUEST-----",
"-----END CERTIFICATE REQUEST-----",
buf, NULL, 0, &use_len );
if( ret == 0 )
{
/* /*
* Was PEM encoded, steal PEM buffer * first copy the raw DER data
*/
p = pem.buf;
pem.buf = NULL;
len = pem.buflen;
pem_free( &pem );
}
else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
{
pem_free( &pem );
return( ret );
}
else
#endif /* POLARSSL_PEM_PARSE_C */
{
/*
* nope, copy the raw DER data
*/ */
p = (unsigned char *) polarssl_malloc( len = buflen ); p = (unsigned char *) polarssl_malloc( len = buflen );
@ -147,7 +119,6 @@ int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
return( POLARSSL_ERR_X509_MALLOC_FAILED ); return( POLARSSL_ERR_X509_MALLOC_FAILED );
memcpy( p, buf, buflen ); memcpy( p, buf, buflen );
}
csr->raw.p = p; csr->raw.p = p;
csr->raw.len = len; csr->raw.len = len;
@ -284,6 +255,51 @@ int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
return( 0 ); return( 0 );
} }
/*
* Parse a CSR, allowing for PEM or raw DER encoding
*/
int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
{
int ret;
#if defined(POLARSSL_PEM_PARSE_C)
size_t use_len;
pem_context pem;
#endif
/*
* Check for valid input
*/
if( csr == NULL || buf == NULL )
return( POLARSSL_ERR_X509_BAD_INPUT_DATA );
#if defined(POLARSSL_PEM_PARSE_C)
pem_init( &pem );
ret = pem_read_buffer( &pem,
"-----BEGIN CERTIFICATE REQUEST-----",
"-----END CERTIFICATE REQUEST-----",
buf, NULL, 0, &use_len );
if( ret == 0 )
{
/*
* Was PEM encoded, parse the result
*/
if( ( ret = x509_csr_parse_der( csr, pem.buf, pem.buflen ) ) != 0 )
return( ret );
pem_free( &pem );
return( 0 );
}
else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
{
pem_free( &pem );
return( ret );
}
else
#endif /* POLARSSL_PEM_PARSE_C */
return( x509_csr_parse_der( csr, buf, buflen ) );
}
#if defined(POLARSSL_FS_IO) #if defined(POLARSSL_FS_IO)
/* /*
* Load a CSR into the structure * Load a CSR into the structure

2
tests/suites/test_suite_x509parse.function
View File

@ -280,7 +280,7 @@ void x509_csr_parse( char *csr_der_hex, char *ref_out, int ref_ret )
memset( my_out, 0, sizeof( my_out ) ); memset( my_out, 0, sizeof( my_out ) );
csr_der = unhexify_alloc( csr_der_hex, &csr_der_len ); csr_der = unhexify_alloc( csr_der_hex, &csr_der_len );
my_ret = x509_csr_parse( &csr, csr_der, csr_der_len ); my_ret = x509_csr_parse_der( &csr, csr_der, csr_der_len );
TEST_ASSERT( my_ret == ref_ret ); TEST_ASSERT( my_ret == ref_ret );
if( ref_ret == 0 ) if( ref_ret == 0 )