summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-07-21 16:23:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-07-21 16:23:59 +0000
commit160f9b5bf6f661695d851e61be349e320d8f633d (patch)
treed0a1a72ec8c8ae342331c4a3654300d78607060d /crypto/engine
parent53e7985c8d22cbde9f1b89dab5d78192671448ec (diff)
Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(),
this means that some implementations will be used automatically, e.g. aesni, we do this for cryptodev anyway. Setup cpuid in ENGINE_load_builtin_engines() too as some ENGINEs use it.
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_all.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 22c120454f..3f5d100de2 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -61,6 +61,8 @@
void ENGINE_load_builtin_engines(void)
{
+ /* Some ENGINEs need this */
+ OPENSSL_cpuid_setup();
#if 0
/* There's no longer any need for an "openssl" ENGINE unless, one day,
* it is the *only* way for standard builtin implementations to be be
@@ -112,6 +114,7 @@ void ENGINE_load_builtin_engines(void)
ENGINE_load_capi();
#endif
#endif
+ ENGINE_register_all_complete();
}
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)