yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 01:15:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mbedtls-1.3' into development

Browse Source 
* mbedtls-1.3:
  Fix bug in Via Padlock support
  Fix portability issue in Makefile
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-02 12:44:00 +01:00
commit f1d2f7c456
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -85,6 +85,7 @@ Features
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).

4
library/padlock.c
View File

@ -104,7 +104,7 @@ int padlock_xcryptecb( aes_context *ctx,
"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 @@ int padlock_xcryptcbc( aes_context *ctx,
: "=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 );

2
tests/Makefile
View File

@ -434,7 +434,7 @@ ifndef WINDOWS
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; \