From 5d4c4b1f95ce1878664fd3ca28787b4633ab3f25 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Tue, 11 Jun 2019 17:16:13 +0100
Subject: [PATCH] Add missing dependencies on !MBEDTLS_X509_REMOVE_INFO

Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
 programs/ssl/ssl_client2.c                 | 2 ++
 tests/suites/test_suite_x509parse.function | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 6e957f50b..963006069 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -2300,8 +2300,10 @@ int main( int argc, char *argv[] )
     else
         mbedtls_printf( " ok\n" );
 
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
     mbedtls_printf( "  . Peer certificate information    ...\n" );
     mbedtls_printf( "%s\n", peer_crt_info );
+#endif /* !MBEDTLS_X509_REMOVE_INFO */
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 
 #if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 8289cd2fb..82f7da54a 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -844,6 +844,8 @@ void x509parse_crt( data_t * buf, char * result_str, int result )
 
         TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
     }
+#else
+    ((void) result_str);
 #endif
 
     mbedtls_x509_crt_free( &crt );