yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-19 06:47:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ret code in dh_client.c

Browse source
This commit is contained in:
Andres Amaya Garcia 2018-04-29 19:23:39 +01:00 committed by Simon Butcher
parent 990900ff40
commit f842345ac3
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
programs/pkey/dh_client.c
View file

@ -29,9 +29,12 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#else #else
#include <stdio.h> #include <stdio.h>
#define mbedtls_printf printf #include <stdlib.h>
#define mbedtls_time_t time_t #define mbedtls_printf printf
#endif #define mbedtls_time_t time_t
#define MBEDTLS_EXTI_SUCCESS EXIT_SUCCESS
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
#endif /* MBEDTLS_PLATFORM_C */
#if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \
defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_NET_C) && \ defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_NET_C) && \
@ -71,7 +74,8 @@ int main( void )
{ {
FILE *f; FILE *f;
int ret; int ret = 1;
int exit_code = MBEDTLS_EXIT_FAILURE;
size_t n, buflen; size_t n, buflen;
mbedtls_net_context server_fd; mbedtls_net_context server_fd;
@ -115,7 +119,6 @@ int main( void )
if( ( f = fopen( "rsa_pub.txt", "rb" ) ) == NULL ) if( ( f = fopen( "rsa_pub.txt", "rb" ) ) == NULL )
{ {
ret = 1;
mbedtls_printf( " failed\n ! Could not open rsa_pub.txt\n" \ mbedtls_printf( " failed\n ! Could not open rsa_pub.txt\n" \
" ! Please run rsa_genkey first\n\n" ); " ! Please run rsa_genkey first\n\n" );
goto exit; goto exit;
@ -191,7 +194,6 @@ int main( void )
if( dhm.len < 64 || dhm.len > 512 ) if( dhm.len < 64 || dhm.len > 512 )
{ {
ret = 1;
mbedtls_printf( " failed\n ! Invalid DHM modulus size\n\n" ); mbedtls_printf( " failed\n ! Invalid DHM modulus size\n\n" );
goto exit; goto exit;
} }
@ -286,6 +288,8 @@ int main( void )
buf[16] = '\0'; buf[16] = '\0';
mbedtls_printf( "\n . Plaintext is \"%s\"\n\n", (char *) buf ); mbedtls_printf( "\n . Plaintext is \"%s\"\n\n", (char *) buf );
exit_code = MBEDTLS_EXIT_SUCCESS;
exit: exit:
mbedtls_net_free( &server_fd ); mbedtls_net_free( &server_fd );
@ -301,7 +305,7 @@ exit:
fflush( stdout ); getchar(); fflush( stdout ); getchar();
#endif #endif
return( ret ); return( exit_code );
} }
#endif /* MBEDTLS_AES_C && MBEDTLS_DHM_C && MBEDTLS_ENTROPY_C && #endif /* MBEDTLS_AES_C && MBEDTLS_DHM_C && MBEDTLS_ENTROPY_C &&
MBEDTLS_NET_C && MBEDTLS_RSA_C && MBEDTLS_SHA256_C && MBEDTLS_NET_C && MBEDTLS_RSA_C && MBEDTLS_SHA256_C &&