commit 612a2f1504d13c8a4a4a2fe199c77edc28126860
author Hanno Becker <hanno.becker@arm.com> Fri Oct 09 09:19:39 2020 +0100
committer Chris Jones <christopher.jones@arm.com> Tue Apr 27 17:18:52 2021 +0100
tree 4b5b1a2184b89782a3e7285b5783c8fcc8ab9b3d
parent 9a969b66c17dbf16bd97a20b932dbdd7e537c203

Rename MBEDTLS_X509_INFO to !MBEDTLS_X509_REMOVE_INFO

The introduction of positive options to control the presence
of pre-existing functionality breaks the build for users of
handwritten configurations.

Signed-off-by: Hanno Becker <hanno.becker@arm.com>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index bf260c3..6e957f5 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -529,12 +529,12 @@
 static int my_verify( void *data, mbedtls_x509_crt *crt,
                       int depth, uint32_t *flags )
 {
-#if defined(MBEDTLS_X509_INFO)
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
     char buf[1024];
 #endif
     ((void) data);
 
-#if defined(MBEDTLS_X509_INFO)
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
     mbedtls_x509_crt_info( buf, sizeof( buf ) - 1, "", crt );
     if( depth == 0 )
         memcpy( peer_crt_info, buf, sizeof( buf ) );
@@ -553,7 +553,7 @@
         mbedtls_printf( "  This certificate has no flags\n" );
     else
     {
-#if defined(MBEDTLS_X509_INFO)
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
         mbedtls_x509_crt_verify_info( buf, sizeof( buf ), "  ! ", *flags );
         mbedtls_printf( "%s\n", buf );
 #endif
@@ -2284,13 +2284,13 @@
 
     if( ( flags = mbedtls_ssl_get_verify_result( &ssl ) ) != 0 )
     {
-#if defined(MBEDTLS_X509_INFO)
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
         char vrfy_buf[512];
 #endif
 
         mbedtls_printf( " failed\n" );
 
-#if defined(MBEDTLS_X509_INFO)
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
         mbedtls_x509_crt_verify_info( vrfy_buf, sizeof( vrfy_buf ),
                                       "  ! ", flags );