Merge branch 'pr_1000' into development-proposed

This commit is contained in:
Gilles Peskine 2018-01-23 00:57:34 +01:00
commit cb1e5eb326
2 changed files with 3 additions and 0 deletions

View File

@ -102,6 +102,8 @@ Bugfix
freeing an RSA context and several MPI's without proper initialization freeing an RSA context and several MPI's without proper initialization
beforehand. beforehand.
* Fix error message in programs/pkey/gen_key.c. Found and fixed by Chris Xue. * Fix error message in programs/pkey/gen_key.c. Found and fixed by Chris Xue.
* Fix programs/pkey/dh_server.c so that it actually works with dh_client.c.
Found and fixed by Martijn de Milliano.
Changes Changes
* Extend cert_write example program by options to set the CRT version * Extend cert_write example program by options to set the CRT version

View File

@ -248,6 +248,7 @@ int main( void )
memset( buf, 0, sizeof( buf ) ); memset( buf, 0, sizeof( buf ) );
n = dhm.len;
if( ( ret = mbedtls_net_recv( &client_fd, buf, n ) ) != (int) n ) if( ( ret = mbedtls_net_recv( &client_fd, buf, n ) ) != (int) n )
{ {
mbedtls_printf( " failed\n ! mbedtls_net_recv returned %d\n\n", ret ); mbedtls_printf( " failed\n ! mbedtls_net_recv returned %d\n\n", ret );