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

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

View File

@ -34,6 +34,9 @@ Bugfix
i386 with SSE2. Found by László Langó. Fixes #1550 i386 with SSE2. Found by László Langó. Fixes #1550
* Fix namespacing in header files. Remove the `mbedtls` namespacing in * Fix namespacing in header files. Remove the `mbedtls` namespacing in
the `#include` in the header files. Resolves #857 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 Changes
* Change the shebang line in Perl scripts to look up perl in the PATH. * Change the shebang line in Perl scripts to look up perl in the PATH.

View File

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