From c8284329208c5928caa88ebffe4226a9da34cac8 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Thu, 19 Sep 2019 16:58:57 +0100 Subject: [PATCH] Make use of copy-less CRT parsing API in ssl_client2/ssl_server2 --- programs/ssl/ssl_client2.c | 10 ++++++++-- programs/ssl/ssl_server2.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 3f77b1a4b..eb62fb254 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1789,7 +1789,7 @@ int main( int argc, char *argv[] ) #endif /* MBEDTLS_PEM_PARSE_C */ for( i = 0; mbedtls_test_cas_der[i] != NULL; i++ ) { - ret = mbedtls_x509_crt_parse_der( cacert, + ret = mbedtls_x509_crt_parse_der_nocopy( cacert, (const unsigned char *) mbedtls_test_cas_der[i], mbedtls_test_cas_der_len[i] ); if( ret != 0 ) @@ -1828,9 +1828,15 @@ int main( int argc, char *argv[] ) else #endif #if defined(MBEDTLS_CERTS_C) - ret = mbedtls_x509_crt_parse( &clicert, +#if defined(MBEDTLS_PEM_PARSE_C) + ret = mbedtls_x509_crt_parse( clicert, (const unsigned char *) mbedtls_test_cli_crt, mbedtls_test_cli_crt_len ); +#else + ret = mbedtls_x509_crt_parse_der_nocopy( clicert, + (const unsigned char *) mbedtls_test_cli_crt, + mbedtls_test_cli_crt_len ); +#endif #else { ret = 1; diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 64d889d87..aaec43402 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -2545,7 +2545,7 @@ int main( int argc, char *argv[] ) #endif /* MBEDTLS_PEM_PARSE_C */ for( i = 0; mbedtls_test_cas_der[i] != NULL; i++ ) { - ret = mbedtls_x509_crt_parse_der( cacert, + ret = mbedtls_x509_crt_parse_der_nocopy( cacert, (const unsigned char *) mbedtls_test_cas_der[i], mbedtls_test_cas_der_len[i] ); if( ret != 0 )