Merge remote-tracking branch 'public/pr/1870' into mbedtls-2.7

This commit is contained in:
Simon Butcher 2018-07-24 10:30:11 +01:00
commit b65d6ce83f
2 changed files with 3 additions and 1 deletions

View file

@ -21,6 +21,9 @@ Bugfix
Philippe Antoine from Catena cyber. #1663.
* Fix namespacing in header files. Remove the `mbedtls` namespacing in
the `#include` in the header files. Resolves #857
* Fix compiler warning of 'use before initialisation' in
mbedtls_pk_parse_key(). Found by Martin Boye Petersen and fixed by Dawid
Drozd. #1098
Changes
* Change the shebang line in Perl scripts to look up perl in the PATH.

View file

@ -1268,7 +1268,6 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
return( ret );
#endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
#else
((void) ret);
((void) pwd);
((void) pwdlen);
#endif /* MBEDTLS_PEM_PARSE_C */