Merge branch 'mbedtls-1.3' into development
* mbedtls-1.3:
Fix bug in Via Padlock support
Fix portability issue in Makefile
diff --git a/ChangeLog b/ChangeLog
index a6dca89..4958da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,7 @@
errors on use of deprecated functions.
Bugfix
+ * Fix bug in Via Padlock support (found by Nikos Mavrogiannopoulos).
* Fix thread safety bug in RSA operations (found by Fredrik Axelsson).
* Fix hardclock() (only used in the benchmarking program) with some
versions of mingw64 (found by kxjhlele).
diff --git a/library/padlock.c b/library/padlock.c
index eff5365..c6e7bf9 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -104,7 +104,7 @@
"movl %1, %%ebx \n\t"
: "=m" (ebx)
: "m" (ebx), "m" (ctrl), "m" (rk), "m" (blk)
- : "ecx", "edx", "esi", "edi" );
+ : "memory", "ecx", "edx", "esi", "edi" );
memcpy( output, blk, 16 );
@@ -155,7 +155,7 @@
: "=m" (ebx)
: "m" (ebx), "m" (count), "m" (ctrl),
"m" (rk), "m" (input), "m" (output), "m" (iw)
- : "eax", "ecx", "edx", "esi", "edi" );
+ : "memory", "eax", "ecx", "edx", "esi", "edi" );
memcpy( iv, iw, 16 );
diff --git a/tests/Makefile b/tests/Makefile
index 28c667c..73f9187 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -434,7 +434,7 @@
RESULT=`$(CHECK_PRELOAD) ./$${i} | grep -v 'PASS$$' | grep -v -- '----' | grep -v '^$$'`; \
PASSED=`echo $$RESULT |grep PASSED`; \
echo " $$RESULT"; \
- if [ "$$PASSED" = "" ]; \
+ if [ "x$$PASSED" = "x" ]; \
then \
echo "**** Failed ***************"; \
RETURN=1; \