diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 15:20:57 -0500 |
| commit | ee914bf036b78dcbde9bf694794c15482d721028 (patch) | |
| tree | 13793fdc02dbf47bd4dd5e93861bccac71d58887 /openssl/engines | |
| parent | faa5026e540d03f858265b2796054d685f687383 (diff) | |
| download | vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.gz vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.bz2 vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.zip | |
Update openssl to version openssl-1.0.1k
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/engines')
| -rw-r--r-- | openssl/engines/e_padlock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl/engines/e_padlock.c b/openssl/engines/e_padlock.c index 9f7a85a8d..5d252f62a 100644 --- a/openssl/engines/e_padlock.c +++ b/openssl/engines/e_padlock.c @@ -384,6 +384,7 @@ padlock_available(void) } #ifndef OPENSSL_NO_AES +#ifndef AES_ASM /* Our own htonl()/ntohl() */ static inline void padlock_bswapl(AES_KEY *ks) @@ -397,6 +398,7 @@ padlock_bswapl(AES_KEY *ks) } } #endif +#endif /* Force key reload from memory to the CPU microcode. Loading EFLAGS from the stack clears EFLAGS[30] |