Merge remote-tracking branch 'public/pr/1872' into mbedtls-2.7
diff --git a/ChangeLog b/ChangeLog
index 7b9adfd..3c52d58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
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.
diff --git a/library/pkparse.c b/library/pkparse.c
index 26a8b70..a83bb01 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1268,7 +1268,6 @@
return( ret );
#endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
#else
- ((void) ret);
((void) pwd);
((void) pwdlen);
#endif /* MBEDTLS_PEM_PARSE_C */
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 8fcb70b..797831e 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -336,6 +336,7 @@
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "${start_red}FAILED: $failure_count${end_color}$failure_summary"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ exit 1
elif [ -z "${1-}" ]; then
echo "SUCCESS :)"
fi