yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add additional error checking

Browse source 
Initialise client and server secret buffers and check their
lengths.

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2022-05-18 14:22:08 +01:00
parent ec2ec42828
commit 306a89094a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
programs/pkey/ecdh_curve25519.c
View file

@ -61,7 +61,8 @@ int main( int argc, char *argv[] )
const char pers[] = "ecdh"; const char pers[] = "ecdh";
size_t olen; size_t olen;
unsigned char secret_cli[32], secret_srv[32]; unsigned char secret_cli[32] = { 0 };
unsigned char secret_srv[32] = { 0 };
const unsigned char *p_cli_to_srv = cli_to_srv; const unsigned char *p_cli_to_srv = cli_to_srv;
((void) argc); ((void) argc);
@ -175,6 +176,8 @@ int main( int argc, char *argv[] )
goto exit; goto exit;
} }
size_t secret_cli_olen = olen;
ret = mbedtls_ecdh_calc_secret( &ctx_srv, &olen, secret_srv, ret = mbedtls_ecdh_calc_secret( &ctx_srv, &olen, secret_srv,
sizeof( secret_srv ), sizeof( secret_srv ),
mbedtls_ctr_drbg_random, &ctr_drbg ); mbedtls_ctr_drbg_random, &ctr_drbg );
@ -185,6 +188,8 @@ int main( int argc, char *argv[] )
goto exit; goto exit;
} }
size_t secret_srv_olen = olen;
mbedtls_printf( " ok\n" ); mbedtls_printf( " ok\n" );
/* /*
@ -193,8 +198,8 @@ int main( int argc, char *argv[] )
mbedtls_printf( " . Check if both calculated secrets are equal..." ); mbedtls_printf( " . Check if both calculated secrets are equal..." );
fflush( stdout ); fflush( stdout );
ret = memcmp( secret_srv, secret_cli, sizeof( secret_srv ) ); ret = memcmp( secret_srv, secret_cli, sizeof( secret_srv_olen ) );
if( ret != 0 ) if( ret != 0 || ( secret_cli_olen != secret_srv_olen ) )
{ {
mbedtls_printf( " failed\n ! Shared secrets not equal.\n" ); mbedtls_printf( " failed\n ! Shared secrets not equal.\n" );
goto exit; goto exit;