SwitchEmu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2026-02-19 00:39:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid in-out length in dhm_calc_secret()

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard
2015-06-02 16:17:08 +01:00
parent f79b425226
commit 3335205a21
9 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
programs/pkey/dh_client.c
View File

@@ -243,8 +243,7 @@ int main( void )
mbedtls_printf( "\n . Shared secret: " );
fflush( stdout );
n = dhm.len;
if( ( ret = mbedtls_dhm_calc_secret( &dhm, buf, &n,
if( ( ret = mbedtls_dhm_calc_secret( &dhm, buf, sizeof( buf ), &n,
mbedtls_ctr_drbg_random, &ctr_drbg ) ) != 0 )
{
mbedtls_printf( " failed\n ! mbedtls_dhm_calc_secret returned %d\n\n", ret );

3
programs/pkey/dh_server.c
View File

@@ -228,7 +228,6 @@ int main( void )
fflush( stdout );
memset( buf, 0, sizeof( buf ) );
n = dhm.len;
if( ( ret = mbedtls_net_recv( &client_fd, buf, n ) ) != (int) n )
{
@@ -248,7 +247,7 @@ int main( void )
mbedtls_printf( "\n . Shared secret: " );
fflush( stdout );
if( ( ret = mbedtls_dhm_calc_secret( &dhm, buf, &n,
if( ( ret = mbedtls_dhm_calc_secret( &dhm, buf, sizeof( buf ), &n,
mbedtls_ctr_drbg_random, &ctr_drbg ) ) != 0 )
{
mbedtls_printf( " failed\n ! mbedtls_dhm_calc_secret returned %d\n\n", ret );

6
programs/test/benchmark.c
View File

@@ -646,15 +646,13 @@ int main( int argc, char *argv[] )
mbedtls_snprintf( title, sizeof( title ), "DHE-%d", dhm_sizes[i] );
TIME_PUBLIC( title, "handshake",
olen = sizeof( buf );
ret |= mbedtls_dhm_make_public( &dhm, (int) dhm.len, buf, dhm.len,
myrand, NULL );
ret |= mbedtls_dhm_calc_secret( &dhm, buf, &olen, myrand, NULL ) );
ret |= mbedtls_dhm_calc_secret( &dhm, buf, sizeof( buf ), &olen, myrand, NULL ) );
mbedtls_snprintf( title, sizeof( title ), "DH-%d", dhm_sizes[i] );
TIME_PUBLIC( title, "handshake",
olen = sizeof( buf );
ret |= mbedtls_dhm_calc_secret( &dhm, buf, &olen, myrand, NULL ) );
ret |= mbedtls_dhm_calc_secret( &dhm, buf, sizeof( buf ), &olen, myrand, NULL ) );
mbedtls_dhm_free( &dhm );
}