Skip to content

Commit b65370f

Browse files
committed
Clean up test function pk_parse_key
- remove incorrect compile-time dependency (the individual cases already have correct run-time dependency information) - remove unused argument - remove unused stack buffer - remove useless code block
1 parent c422679 commit b65370f

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

tests/suites/test_suite_pkparse.data

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,32 +1073,32 @@ depends_on:MBEDTLS_PEM_PARSE_C:MBEDTLS_ECP_C:MBEDTLS_ECP_DP_SECP256K1_ENABLED:MB
10731073
pk_parse_keyfile_ec:"data_files/ec_prv.specdom.der":"NULL":0
10741074

10751075
Key ASN1 (Incorrect first tag)
1076-
pk_parse_key:"":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1076+
pk_parse_key:"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
10771077

10781078
Key ASN1 (RSAPrivateKey, incorrect version tag)
10791079
depends_on:MBEDTLS_RSA_C
1080-
pk_parse_key:"300100":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1080+
pk_parse_key:"300100":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
10811081

10821082
Key ASN1 (RSAPrivateKey, version tag missing)
10831083
depends_on:MBEDTLS_RSA_C
1084-
pk_parse_key:"3000":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1084+
pk_parse_key:"3000":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
10851085

10861086
Key ASN1 (RSAPrivateKey, invalid version)
10871087
depends_on:MBEDTLS_RSA_C
1088-
pk_parse_key:"3003020101":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1088+
pk_parse_key:"3003020101":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
10891089

10901090
Key ASN1 (RSAPrivateKey, correct version, incorrect tag)
10911091
depends_on:MBEDTLS_RSA_C
1092-
pk_parse_key:"300402010000":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1092+
pk_parse_key:"300402010000":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
10931093

10941094
Key ASN1 (RSAPrivateKey, values present, length mismatch)
10951095
depends_on:MBEDTLS_RSA_C
1096-
pk_parse_key:"301c02010002010102010102010102010102010102010102010102010100":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1096+
pk_parse_key:"301c02010002010102010102010102010102010102010102010102010100":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
10971097

10981098
Key ASN1 (RSAPrivateKey, values present, check_privkey fails)
10991099
depends_on:MBEDTLS_RSA_C
1100-
pk_parse_key:"301b020100020102020101020101020101020101020101020101020101":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1100+
pk_parse_key:"301b020100020102020101020101020101020101020101020101020101":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
11011101

11021102
Key ASN1 (ECPrivateKey, empty parameters)
11031103
depends_on:MBEDTLS_ECP_C
1104-
pk_parse_key:"30070201010400a000":"":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT
1104+
pk_parse_key:"30070201010400a000":MBEDTLS_ERR_PK_KEY_INVALID_FORMAT

tests/suites/test_suite_pkparse.function

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,14 @@ exit:
113113
}
114114
/* END_CASE */
115115

116-
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C */
117-
void pk_parse_key( data_t * buf, char * result_str, int result )
116+
/* BEGIN_CASE */
117+
void pk_parse_key( data_t * buf, int result )
118118
{
119119
mbedtls_pk_context pk;
120-
unsigned char output[2000];
121-
((void) result_str);
122120

123121
mbedtls_pk_init( &pk );
124122

125-
memset( output, 0, 2000 );
126-
127-
128-
TEST_ASSERT( mbedtls_pk_parse_key( &pk, buf->x, buf->len, NULL, 0 ) == ( result ) );
129-
if( ( result ) == 0 )
130-
{
131-
TEST_ASSERT( 1 );
132-
}
123+
TEST_ASSERT( mbedtls_pk_parse_key( &pk, buf->x, buf->len, NULL, 0 ) == result );
133124

134125
exit:
135126
mbedtls_pk_free( &pk );

0 commit comments

Comments
 (0)