diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-01-08 22:40:39 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-01-08 22:40:39 +0000 |
commit | c6485458b37e3f0f5d1c69c0452e4551ac3b1824 (patch) | |
tree | c2b36ecba3cb850d324786e97809c541cb5c2d5a /engines | |
parent | 58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (diff) | |
download | src-c6485458b37e3f0f5d1c69c0452e4551ac3b1824.tar.gz src-c6485458b37e3f0f5d1c69c0452e4551ac3b1824.zip |
Import OpenSSL 1.0.1k.vendor/openssl/1.0.1k
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=276856
svn path=/vendor-crypto/openssl/1.0.1k/; revision=276858; tag=vendor/openssl/1.0.1k
Diffstat (limited to 'engines')
-rw-r--r-- | engines/e_padlock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c index 9f7a85a8da57..5d252f62a9ca 100644 --- a/engines/e_padlock.c +++ b/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] |