lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00
Code Activity

Merge pull request #6391 from davidhorstmann-arm/fix-x509-get-name-cleanup

Browse Source 
The Open CI ran successfully thus I think we can ignore the internal CI.
This commit is contained in:
Ronald Cron
2022-10-26 14:27:54 +02:00
committed by GitHub
parent 3e0ea98b7c 2bb9c8a884
commit 4f7feca0dc
4 changed files with 116 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/suites/test_suite_x509parse.data
View File

@ -415,6 +415,46 @@ mbedtls_x509_dn_get_next:"C=NL, O=PolarSSL, CN=PolarSSL Server 1":0x03:"C":1:"C=
X509 Get Next DN #4 Consecutive Multivalue RDNs
mbedtls_x509_dn_get_next:"C=NL, O=PolarSSL, title=Example, CN=PolarSSL Server 1":0x05:"C title":2:"C=NL + O=PolarSSL, title=Example + CN=PolarSSL Server 1"
# Parse the following valid DN:
#
# 31 0B <- Set of
# 30 09 <- Sequence of
# 06 03 55 04 06 <- OID 2.5.4.6 countryName (C)
# 13 02 4E 4C <- PrintableString "NL"
# 31 11 <- Set of
# 30 0F <- Sequence of
# 06 03 55 04 0A <- OID 2.5.4.10 organizationName (O)
# 0C 08 50 6F 6C 61 72 53 53 4C <- UTF8String "PolarSSL"
# 31 19 <- Set of
# 30 17 <- Sequence of
# 06 03 55 04 03 <- OID 2.5.4.3 commonName (CN)
# 0C 10 50 6F 6C 61 72 53 53 4C 20 54 65 73 74 20 43 41 <- UTF8String "PolarSSL Test CA"
#
X509 Get Name Valid DN
mbedtls_x509_get_name:"310B3009060355040613024E4C3111300F060355040A0C08506F6C617253534C3119301706035504030C10506F6C617253534C2054657374204341":0
# Parse the following corrupted DN:
#
# 31 0B <- Set of
# 30 09 <- Sequence of
# 06 03 55 04 06 <- OID 2.5.4.6 countryName (C)
# 13 02 4E 4C <- PrintableString "NL"
# 31 11 <- Set of
# 30 0F <- Sequence of
# 06 03 55 04 0A <- OID 2.5.4.10 organizationName (O)
# 0C 08 50 6F 6C 61 72 53 53 4C <- UTF8String "PolarSSL"
# 30 19 <- Sequence of (corrupted)
# 30 17 <- Sequence of
# 06 03 55 04 03 <- OID 2.5.4.3 commonName (CN)
# 0C 10 50 6F 6C 61 72 53 53 4C 20 54 65 73 74 20 43 41 <- UTF8String "PolarSSL Test CA"
#
# The third 'Set of' is corrupted to instead be a 'Sequence of', causing an
# error and forcing mbedtls_x509_get_name() to clean up the names it has
# already allocated.
#
X509 Get Name Corrupted DN Mem Leak
mbedtls_x509_get_name:"310B3009060355040613024E4C3111300F060355040A0C08506F6C617253534C3019301706035504030C10506F6C617253534C2054657374204341":MBEDTLS_ERR_X509_INVALID_NAME + MBEDTLS_ERR_ASN1_UNEXPECTED_TAG
X509 Time Expired #1
depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_RSA_C:MBEDTLS_HAVE_TIME_DATE:MBEDTLS_HAS_ALG_SHA_1_VIA_MD_OR_PSA_BASED_ON_USE_PSA
mbedtls_x509_time_is_past:"data_files/server1.crt":"valid_from":1

35
tests/suites/test_suite_x509parse.function
View File

@ -818,6 +818,41 @@ exit:
}
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C */
void mbedtls_x509_get_name( char * rdn_sequence, int exp_ret )
{
unsigned char *name;
unsigned char *p;
size_t name_len;
mbedtls_x509_name head;
mbedtls_x509_name *allocated, *prev;
int ret;
memset( &head, 0, sizeof( head ) );
name = mbedtls_test_unhexify_alloc( rdn_sequence, &name_len );
p = name;
ret = mbedtls_x509_get_name( &p, ( name + name_len ), &head );
if( ret == 0 )
{
allocated = head.next;
while( allocated != NULL )
{
prev = allocated;
allocated = allocated->next;
mbedtls_free( prev );
}
}
TEST_EQUAL( ret, exp_ret );
mbedtls_free( name );
}
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_X509_CREATE_C:MBEDTLS_X509_USE_C:MBEDTLS_X509_CRT_PARSE_C:!MBEDTLS_X509_REMOVE_INFO */
void mbedtls_x509_dn_get_next( char * name_str, int next_merged, char * expected_oids, int exp_count, char * exp_dn_gets )
{