diff options
author | thib <> | 2010-07-01 17:44:20 +0000 |
---|---|---|
committer | thib <> | 2010-07-01 17:44:20 +0000 |
commit | aaf95101ecdb076e7121125b5b59b79338f68e63 (patch) | |
tree | e732da07cd98066d0bfc1903e3ee73114f5b295c /src/lib/libcrypto/engine/eng_all.c | |
parent | 1b4deace3d997af54c492a67c6f9468ec87b9b5d (diff) | |
download | openbsd-aaf95101ecdb076e7121125b5b59b79338f68e63.tar.gz openbsd-aaf95101ecdb076e7121125b5b59b79338f68e63.tar.bz2 openbsd-aaf95101ecdb076e7121125b5b59b79338f68e63.zip |
AES-NI engine support for OpenSSL.
This is code mostly picked up from upstream OpenSSL, or to be more exact
a diff from David Woodhouse <dwmw2 at infradead dot org>.
Remember to make includes before doing a build!
no objections from djm@
OK deraadt@, reyk@ (AES is about 4.25x faster on his x201 now)
Diffstat (limited to 'src/lib/libcrypto/engine/eng_all.c')
-rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c index d29cd57dc2..69e54f461e 100644 --- a/src/lib/libcrypto/engine/eng_all.c +++ b/src/lib/libcrypto/engine/eng_all.c | |||
@@ -71,6 +71,11 @@ void ENGINE_load_builtin_engines(void) | |||
71 | #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) | 71 | #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) |
72 | ENGINE_load_padlock(); | 72 | ENGINE_load_padlock(); |
73 | #endif | 73 | #endif |
74 | |||
75 | #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AESNI) | ||
76 | ENGINE_load_aesni(); | ||
77 | #endif | ||
78 | |||
74 | ENGINE_load_dynamic(); | 79 | ENGINE_load_dynamic(); |
75 | #ifndef OPENSSL_NO_STATIC_ENGINE | 80 | #ifndef OPENSSL_NO_STATIC_ENGINE |
76 | #ifndef OPENSSL_NO_HW | 81 | #ifndef OPENSSL_NO_HW |