Merge remote-tracking branch 'public/pr/1965' into development

This commit is contained in:
Simon Butcher 2018-08-28 12:34:14 +01:00
commit 9ce5160fea
2 changed files with 3 additions and 1 deletions

View File

@ -43,6 +43,9 @@ Bugfix
Fixes #1954. Fixes #1954.
* Fix memory leak and free without initialization in pk_encrypt * Fix memory leak and free without initialization in pk_encrypt
and pk_decrypt example programs. Reported by Brace Stout. Fixes #1128. and pk_decrypt example programs. Reported by Brace Stout. Fixes #1128.
* Remove redundant else statement, which is not readable, and the positive
path in the if statement results in exiting the funciton. Raised by irwir
in #1776.
Changes Changes
* Copy headers preserving timestamps when doing a "make install". * Copy headers preserving timestamps when doing a "make install".

View File

@ -1897,7 +1897,6 @@ int mbedtls_ecp_check_privkey( const mbedtls_ecp_group *grp, const mbedtls_mpi *
mbedtls_mpi_get_bit( d, 1 ) != 0 || mbedtls_mpi_get_bit( d, 1 ) != 0 ||
mbedtls_mpi_bitlen( d ) - 1 != grp->nbits ) /* mbedtls_mpi_bitlen is one-based! */ mbedtls_mpi_bitlen( d ) - 1 != grp->nbits ) /* mbedtls_mpi_bitlen is one-based! */
return( MBEDTLS_ERR_ECP_INVALID_KEY ); return( MBEDTLS_ERR_ECP_INVALID_KEY );
else
/* see [Curve25519] page 5 */ /* see [Curve25519] page 5 */
if( grp->nbits == 254 && mbedtls_mpi_get_bit( d, 2 ) != 0 ) if( grp->nbits == 254 && mbedtls_mpi_get_bit( d, 2 ) != 0 )