diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:16:26 -0500 |
| commit | 29d3851ef58419274f5f80a050d22b14319eff74 (patch) | |
| tree | c70cbddb9c2100abb5e0e5fdd5acaf180b89b946 /openssl/engines | |
| parent | a1babdda61e8cb3f8d0608d87120ba46ca91a21d (diff) | |
| download | vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.tar.gz vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.tar.bz2 vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.zip | |
Update openssl to version openssl-1.0.1k
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] |