commit 663638d20216a7e3b68fc42afe0ef94e75ace77b
author Simon Butcher <simon.butcher@arm.com> Tue Apr 12 15:04:10 2016 +0100
committer Simon Butcher <simon.butcher@arm.com> Wed May 18 19:36:03 2016 +0100
tree b30b1ef863d58aa2e322b07bde0a4d885b3d046a
parent 4529c48c42d99b13c80b140236d43511c5f6b312

Corrects platform return values in rsa sample programs

programs/pkey/rsa_decrypt.c

diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c
index 5bfe332..e96367a 100644
--- a/programs/pkey/rsa_decrypt.c
+++ b/programs/pkey/rsa_decrypt.c
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #define mbedtls_printf     printf
 #define mbedtls_exit       exit
-#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
-#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
 #endif
 
 #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_RSA_C) && \
@@ -71,7 +69,7 @@
     ((void) argv);
 
     memset(result, 0, sizeof( result ) );
-    exit_val = MBEDTLS_EXIT_SUCCESS;
+    exit_val = 0;
 
     if( argc != 1 )
     {
@@ -81,7 +79,7 @@
         mbedtls_printf( "\n" );
 #endif
 
-        mbedtls_exit( MBEDTLS_EXIT_FAILURE );
+        mbedtls_exit( 1 );
     }
 
     mbedtls_printf( "\n  . Seeding the random number generator..." );
@@ -95,7 +93,7 @@
                                         strlen( pers ) );
     if( return_val != 0 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! mbedtls_ctr_drbg_seed returned %d\n",
                         return_val );
         goto exit;
@@ -106,7 +104,7 @@
 
     if( ( f = fopen( "rsa_priv.txt", "rb" ) ) == NULL )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! Could not open rsa_priv.txt\n" \
                 "  ! Please run rsa_genkey first\n\n" );
         goto exit;
@@ -121,7 +119,7 @@
         ( return_val = mbedtls_mpi_read_file( &rsa.DQ, 16, f ) ) != 0 ||
         ( return_val = mbedtls_mpi_read_file( &rsa.QP, 16, f ) ) != 0 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! mbedtls_mpi_read_file returned %d\n\n",
                         return_val );
         goto exit;
@@ -136,7 +134,7 @@
      */
     if( ( f = fopen( "result-enc.txt", "rb" ) ) == NULL )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( "\n  ! Could not open %s\n\n", "result-enc.txt" );
         goto exit;
     }
@@ -151,7 +149,7 @@
 
     if( i != rsa.len )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( "\n  ! Invalid RSA signature format\n\n" );
         goto exit;
     }
@@ -167,7 +165,7 @@
                                             buf, result, 1024 );
     if( return_val != 0 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! mbedtls_rsa_pkcs1_decrypt returned %d\n\n",
                         return_val );
         goto exit;

programs/pkey/rsa_encrypt.c

diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c
index 9619baa..1ba8dea 100644
--- a/programs/pkey/rsa_encrypt.c
+++ b/programs/pkey/rsa_encrypt.c
@@ -32,8 +32,6 @@
 #define mbedtls_fprintf    fprintf
 #define mbedtls_printf     printf
 #define mbedtls_exit       exit
-#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
-#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
 #endif
 
 #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_RSA_C) && \
@@ -69,7 +67,7 @@
     unsigned char buf[512];
     const char *pers = "rsa_encrypt";
 
-    exit_val = MBEDTLS_EXIT_SUCCESS;
+    exit_val = 0;
 
     if( argc != 2 )
     {
@@ -79,7 +77,7 @@
         mbedtls_printf( "\n" );
 #endif
 
-        mbedtls_exit( MBEDTLS_EXIT_FAILURE );
+        mbedtls_exit( 1 );
     }
 
     mbedtls_printf( "\n  . Seeding the random number generator..." );
@@ -94,7 +92,7 @@
                                         strlen( pers ) );
     if( return_val != 0 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! mbedtls_ctr_drbg_seed returned %d\n",
                         return_val );
         goto exit;
@@ -105,7 +103,7 @@
 
     if( ( f = fopen( "rsa_pub.txt", "rb" ) ) == NULL )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! Could not open rsa_pub.txt\n" \
                 "  ! Please run rsa_genkey first\n\n" );
         goto exit;
@@ -114,7 +112,7 @@
     if( ( return_val = mbedtls_mpi_read_file( &rsa.N, 16, f ) ) != 0 ||
         ( return_val = mbedtls_mpi_read_file( &rsa.E, 16, f ) ) != 0 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! mbedtls_mpi_read_file returned %d\n\n",
                         return_val );
         goto exit;
@@ -126,7 +124,7 @@
 
     if( strlen( argv[1] ) > 100 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " Input data larger than 100 characters.\n\n" );
         goto exit;
     }
@@ -144,7 +142,7 @@
                                             strlen( argv[1] ), input, buf );
     if( return_val != 0 )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! mbedtls_rsa_pkcs1_encrypt returned %d\n\n",
                         return_val );
         goto exit;
@@ -155,7 +153,7 @@
      */
     if( ( f = fopen( "result-enc.txt", "wb+" ) ) == NULL )
     {
-        exit_val = MBEDTLS_EXIT_FAILURE;
+        exit_val = 1;
         mbedtls_printf( " failed\n  ! Could not create %s\n\n", "result-enc.txt" );
         goto exit;
     }