Add return value printing for failed platform initialization

Unify error handling in tests

Author: Andrzej Kurek

authcrypt/main.cpp

@@ -25,16 +25,18 @@
 
 int main() {
     mbedtls_platform_context platform_ctx;
-    if(mbedtls_platform_setup(&platform_ctx) != 0) {
-        return -1;
+    int exit_code = MBEDTLS_EXIT_FAILURE;
+
+    if((exit_code = mbedtls_platform_setup(&platform_ctx)) != 0) {
+        printf("Platform initialization failed with error %d\r\n", exit_code);
+        return MBEDTLS_EXIT_FAILURE;
     }
 
-    int exit_code = MBEDTLS_EXIT_SUCCESS;
     Authcrypt *authcrypt = new Authcrypt(&platform_ctx);
 
-    if (authcrypt->run() != 0) {
+    if ((exit_code = authcrypt->run()) != 0) {
+        mbedtls_printf("Example failed with error %d\r\n", exit_code);
         exit_code = MBEDTLS_EXIT_FAILURE;
-        mbedtls_printf("\r\nFAIL\r\n");
     }
 
     delete authcrypt;

benchmark/main.cpp

@@ -654,17 +654,17 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
         mbedtls_ctr_drbg_init( &ctr_drbg );
 
         if( mbedtls_ctr_drbg_seed( &ctr_drbg, myrand, NULL, NULL, 0 ) != 0 )
-            mbedtls_exit(1);
+            return(1);
         TIME_AND_TSC( "CTR_DRBG (NOPR)",
                 if( mbedtls_ctr_drbg_random( &ctr_drbg, buf, BUFSIZE ) != 0 )
-                mbedtls_exit(1) );
+                return(1) );
 
         if( mbedtls_ctr_drbg_seed( &ctr_drbg, myrand, NULL, NULL, 0 ) != 0 )
-            mbedtls_exit(1);
+            return(1);
         mbedtls_ctr_drbg_set_prediction_resistance( &ctr_drbg, MBEDTLS_CTR_DRBG_PR_ON );
         TIME_AND_TSC( "CTR_DRBG (PR)",
                 if( mbedtls_ctr_drbg_random( &ctr_drbg, buf, BUFSIZE ) != 0 )
-                mbedtls_exit(1) );
+                return(1) );
         mbedtls_ctr_drbg_free( &ctr_drbg );
     }
 #endif
@@ -679,43 +679,43 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
 
 #if defined(MBEDTLS_SHA1_C)
         if( ( md_info = mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 ) ) == NULL )
-            mbedtls_exit(1);
+            return(1);
 
         if( mbedtls_hmac_drbg_seed( &hmac_drbg, md_info, myrand, NULL, NULL, 0 ) != 0 )
-            mbedtls_exit(1);
+            return(1);
         TIME_AND_TSC( "HMAC_DRBG SHA-1 (NOPR)",
                 if( mbedtls_hmac_drbg_random( &hmac_drbg, buf, BUFSIZE ) != 0 )
-                mbedtls_exit(1) );
+                return(1) );
         mbedtls_hmac_drbg_free( &hmac_drbg );
 
         if( mbedtls_hmac_drbg_seed( &hmac_drbg, md_info, myrand, NULL, NULL, 0 ) != 0 )
-            mbedtls_exit(1);
+            return(1);
         mbedtls_hmac_drbg_set_prediction_resistance( &hmac_drbg,
                                              MBEDTLS_HMAC_DRBG_PR_ON );
         TIME_AND_TSC( "HMAC_DRBG SHA-1 (PR)",
                 if( mbedtls_hmac_drbg_random( &hmac_drbg, buf, BUFSIZE ) != 0 )
-                mbedtls_exit(1) );
+                return(1) );
         mbedtls_hmac_drbg_free( &hmac_drbg );
 #endif
 
 #if defined(MBEDTLS_SHA256_C)
         if( ( md_info = mbedtls_md_info_from_type( MBEDTLS_MD_SHA256 ) ) == NULL )
-            mbedtls_exit(1);
+            return(1);
 
         if( mbedtls_hmac_drbg_seed( &hmac_drbg, md_info, myrand, NULL, NULL, 0 ) != 0 )
-            mbedtls_exit(1);
+            return(1);
         TIME_AND_TSC( "HMAC_DRBG SHA-256 (NOPR)",
                 if( mbedtls_hmac_drbg_random( &hmac_drbg, buf, BUFSIZE ) != 0 )
-                mbedtls_exit(1) );
+                return(1) );
         mbedtls_hmac_drbg_free( &hmac_drbg );
 
         if( mbedtls_hmac_drbg_seed( &hmac_drbg, md_info, myrand, NULL, NULL, 0 ) != 0 )
-            mbedtls_exit(1);
+            return(1);
         mbedtls_hmac_drbg_set_prediction_resistance( &hmac_drbg,
                                              MBEDTLS_HMAC_DRBG_PR_ON );
         TIME_AND_TSC( "HMAC_DRBG SHA-256 (PR)",
                 if( mbedtls_hmac_drbg_random( &hmac_drbg, buf, BUFSIZE ) != 0 )
-                mbedtls_exit(1) );
+                return(1) );
         mbedtls_hmac_drbg_free( &hmac_drbg );
 #endif
     }
@@ -774,13 +774,13 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
             if( mbedtls_mpi_read_string( &dhm.P, 16, dhm_P[i] ) != 0 ||
                 mbedtls_mpi_read_string( &dhm.G, 16, dhm_G[i] ) != 0 )
             {
-                mbedtls_exit( 1 );
+                return( 1 );
             }
 
             dhm.len = mbedtls_mpi_size( &dhm.P );
             mbedtls_dhm_make_public( &dhm, (int) dhm.len, buf, dhm.len, myrand, NULL );
             if( mbedtls_mpi_copy( &dhm.GY, &dhm.GX ) != 0 )
-                mbedtls_exit( 1 );
+                return( 1 );
 
             mbedtls_snprintf( title, sizeof( title ), "DHE-%d", dhm_sizes[i] );
             TIME_PUBLIC( title, "handshake",
@@ -813,7 +813,7 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
             mbedtls_ecdsa_init( &ecdsa );
 
             if( mbedtls_ecdsa_genkey( &ecdsa, curve_info->grp_id, myrand, NULL ) != 0 )
-                mbedtls_exit( 1 );
+                return( 1 );
             ecp_clear_precomputed( &ecdsa.grp );
 
             mbedtls_snprintf( title, sizeof( title ), "ECDSA-%s",
@@ -835,7 +835,7 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
                 mbedtls_ecdsa_write_signature( &ecdsa, MBEDTLS_MD_SHA256, buf, curve_info->bit_size,
                                                tmp, &sig_len, myrand, NULL ) != 0 )
             {
-                mbedtls_exit( 1 );
+                return( 1 );
             }
             ecp_clear_precomputed( &ecdsa.grp );
 
@@ -871,7 +871,7 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
                                   myrand, NULL ) != 0 ||
                 mbedtls_ecp_copy( &ecdh.Qp, &ecdh.Q ) != 0 )
             {
-                mbedtls_exit( 1 );
+                return( 1 );
             }
             ecp_clear_precomputed( &ecdh.grp );
 
@@ -893,7 +893,7 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
         if( mbedtls_ecp_group_load( &ecdh.grp, MBEDTLS_ECP_DP_CURVE25519 ) != 0 ||
             mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Qp, myrand, NULL ) != 0 )
         {
-            mbedtls_exit( 1 );
+            return( 1 );
         }
 
         TIME_PUBLIC(  "ECDHE-Curve25519", "handshake",
@@ -919,7 +919,7 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
                 mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf ),
                                   myrand, NULL ) != 0 )
             {
-                mbedtls_exit( 1 );
+                return( 1 );
             }
             ecp_clear_precomputed( &ecdh.grp );
 
@@ -941,7 +941,7 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
                              myrand, NULL ) != 0 ||
             mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Q, myrand, NULL ) != 0 )
         {
-            mbedtls_exit( 1 );
+            return( 1 );
         }
 
         TIME_PUBLIC(  "ECDH-Curve25519", "handshake",
@@ -965,13 +965,19 @@ static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
 
 int main(void) {
     mbedtls_platform_context platform_ctx;
-    if(mbedtls_platform_setup(&platform_ctx) != 0) {
-        return -1;
+    int exit_code = MBEDTLS_EXIT_FAILURE;
+
+    if((exit_code = mbedtls_platform_setup(&platform_ctx)) != 0) {
+        printf("Platform initialization failed with error %d\r\n", exit_code);
+        return MBEDTLS_EXIT_FAILURE;
     }
 
-    int ret = benchmark(0, NULL, &platform_ctx);
-    if (ret != 0) {
-        mbedtls_printf("Benchmark failed with error %d\r\n", ret);
+    exit_code = benchmark(0, NULL, &platform_ctx);
+    if (exit_code != 0) {
+        mbedtls_printf("Benchmark failed with error %d\r\n", exit_code);
+        exit_code = MBEDTLS_EXIT_FAILURE;
     }
+
     mbedtls_platform_teardown(&platform_ctx);
+    return exit_code;
 }

hashing/main.cpp

@@ -158,13 +158,19 @@ static int example(mbedtls_platform_context* ctx)
 
 int main() {
     mbedtls_platform_context platform_ctx;
-    if(mbedtls_platform_setup(&platform_ctx) != 0) {
-        return -1;
+    int exit_code = MBEDTLS_EXIT_FAILURE;
+
+    if((exit_code = mbedtls_platform_setup(&platform_ctx)) != 0) {
+        printf("Platform initialization failed with error %d\r\n", exit_code);
+        return MBEDTLS_EXIT_FAILURE;
     }
 
-    int ret = example(&platform_ctx);
-    if (ret != 0) {
-        mbedtls_printf("Example failed with error %d\r\n", ret);
+    exit_code = example(&platform_ctx);
+    if (exit_code != 0) {
+        mbedtls_printf("Example failed with error %d\r\n", exit_code);
+        exit_code = MBEDTLS_EXIT_FAILURE;
     }
+
     mbedtls_platform_teardown(&platform_ctx);
+    return exit_code;
 }

tls-client/main.cpp

@@ -50,16 +50,18 @@ const int SERVER_PORT = 443;
 int main()
 {
     mbedtls_platform_context platform_ctx;
-    if(mbedtls_platform_setup(&platform_ctx) != 0) {
-        return -1;
+    int exit_code = MBEDTLS_EXIT_FAILURE;
+
+    if((exit_code = mbedtls_platform_setup(&platform_ctx)) != 0) {
+        printf("Platform initialization failed with error %d\r\n", exit_code);
+        return MBEDTLS_EXIT_FAILURE;
     }
     /*
      * The default 9600 bps is too slow to print full TLS debug info and could
      * cause the other party to time out.
      */
 
     HelloHttpsClient *client;
-    int exit_code = MBEDTLS_EXIT_FAILURE;
 
     mbedtls_printf("Starting mbed-os-example-tls/tls-client\n");