yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-24 21:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Simon Butcher 2018-07-24 10:30:11 +01:00
parent 66e2b654a8 c6a0fd8e83
commit b65d6ce83f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -21,6 +21,9 @@ Bugfix
Philippe Antoine from Catena cyber. #1663. Philippe Antoine from Catena cyber. #1663.
* 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.

1
library/pkparse.c
View file

@ -1268,7 +1268,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 */