mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 13:43:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address minor review comments

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2022-08-11 14:38:26 +01:00
parent ec9f6b4de1
commit 5f3f0d06e6
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/x509write_crt.c
View File

@ -303,7 +303,10 @@ int mbedtls_x509write_crt_set_ext_key_usage( mbedtls_x509write_cert *ctx,
unsigned char *c = buf + sizeof(buf); unsigned char *c = buf + sizeof(buf);
int ret; int ret;
size_t len = 0; size_t len = 0;
const mbedtls_asn1_sequence *last_ext = 0, *ext; const mbedtls_asn1_sequence *last_ext = NULL;
mbedtls_asn1_sequence *ext;
memset( buf, 0, sizeof(buf) );
/* We need at least one extension: SEQUENCE SIZE (1..MAX) OF KeyPurposeId */ /* We need at least one extension: SEQUENCE SIZE (1..MAX) OF KeyPurposeId */
if( exts == NULL ) if( exts == NULL )
@ -324,14 +327,10 @@ int mbedtls_x509write_crt_set_ext_key_usage( mbedtls_x509write_cert *ctx,
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) ); MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &c, buf, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ); MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &c, buf, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
ret = mbedtls_x509write_crt_set_extension( ctx, return mbedtls_x509write_crt_set_extension( ctx,
MBEDTLS_OID_EXTENDED_KEY_USAGE, MBEDTLS_OID_EXTENDED_KEY_USAGE,
MBEDTLS_OID_SIZE( MBEDTLS_OID_EXTENDED_KEY_USAGE ), MBEDTLS_OID_SIZE( MBEDTLS_OID_EXTENDED_KEY_USAGE ),
1, c, len ); 1, c, len );
if( ret != 0 )
return( ret );
return( 0 );
} }
int mbedtls_x509write_crt_set_ns_cert_type( mbedtls_x509write_cert *ctx, int mbedtls_x509write_crt_set_ns_cert_type( mbedtls_x509write_cert *ctx,

3
programs/x509/cert_write.c
View File

@ -1,4 +1,3 @@
/* /*
* Certificate generation and signing * Certificate generation and signing
* *
@ -832,7 +831,7 @@ int main( int argc, char *argv[] )
ret = mbedtls_x509write_crt_set_ns_cert_type( &crt, opt.ns_cert_type ); ret = mbedtls_x509write_crt_set_ns_cert_type( &crt, opt.ns_cert_type );
if( ret != 0 ) if( ret != 0 )
{ {
mbedtls_strerror( ret, buf, 1024 ); mbedtls_strerror( ret, buf, sizeof(buf) );
mbedtls_printf( " failed\n ! mbedtls_x509write_crt_set_ns_cert_type " mbedtls_printf( " failed\n ! mbedtls_x509write_crt_set_ns_cert_type "
"returned -0x%04x - %s\n\n", (unsigned int) -ret, buf ); "returned -0x%04x - %s\n\n", (unsigned int) -ret, buf );
goto exit; goto exit;

21
tests/suites/test_suite_x509write.function
View File

@ -350,19 +350,24 @@ void x509_crt_check( char *subject_key_file, char *subject_pwd,
if( strcmp( ext_key_usage, "NULL" ) != 0 ) if( strcmp( ext_key_usage, "NULL" ) != 0 )
{ {
mbedtls_asn1_sequence exts[2]; mbedtls_asn1_sequence exts[2];
memset(exts, 0, sizeof(exts)); memset( exts, 0, sizeof(exts) );
#define SET_OID(x, oid) \
do { x.len = MBEDTLS_OID_SIZE(oid); x.p = (unsigned char*)oid; \ #define SET_OID(x, oid) \
x.tag = MBEDTLS_ASN1_OID; } while( 0 ) do { \
x.len = MBEDTLS_OID_SIZE(oid); \
x.p = (unsigned char*)oid; \
x.tag = MBEDTLS_ASN1_OID; \
} while( 0 )
if( strcmp( ext_key_usage, "serverAuth" ) == 0 ) if( strcmp( ext_key_usage, "serverAuth" ) == 0 )
{ {
SET_OID( exts[0].buf, MBEDTLS_OID_SERVER_AUTH ); SET_OID( exts[0].buf, MBEDTLS_OID_SERVER_AUTH );
} }
else if( strcmp( ext_key_usage, "codeSigning,timeStamping" ) == 0 ) else if( strcmp( ext_key_usage, "codeSigning,timeStamping" ) == 0 )
{ {
SET_OID( exts[0].buf, MBEDTLS_OID_CODE_SIGNING ); SET_OID( exts[0].buf, MBEDTLS_OID_CODE_SIGNING );
exts[0].next = &exts[1]; exts[0].next = &exts[1];
SET_OID( exts[1].buf, MBEDTLS_OID_TIME_STAMPING ); SET_OID( exts[1].buf, MBEDTLS_OID_TIME_STAMPING );
} }
TEST_ASSERT( mbedtls_x509write_crt_set_ext_key_usage( &crt, exts ) == 0 ); TEST_ASSERT( mbedtls_x509write_crt_set_ext_key_usage( &crt, exts ) == 0 );
} }