Fix bug in Via Padlock support

Backport of cf201201 from the 1.3 branch
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-10 17:38:38 +02:00
parent 7e82884811
commit cd7d24d464
2 changed files with 3 additions and 2 deletions

View file

@ -7,6 +7,7 @@ Security
crash it remotely (found by Caj Larsson).
Bugfix
* Fix bug in Via Padlock support (found by Nikos Mavrogiannopoulos).
* Fix hardclock() (only used in the benchmarking program) with some
versions of mingw64 (found by kxjhlele).
* Fix warnings from mingw64 in timing.c (found by kxjklele).

View file

@ -98,7 +98,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 );
@ -149,7 +149,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 );