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

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

View File

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