aboutsummaryrefslogtreecommitdiffstats
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
parent53e7985c8d22cbde9f1b89dab5d78192671448ec (diff)
downloadopenssl-160f9b5bf6f661695d851e61be349e320d8f633d.tar.gz
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.
-rw-r--r--CHANGES5
-rw-r--r--crypto/engine/eng_all.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 17f83c4750..3ebb5b28c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
Changes between 1.0.0a and 1.0.1 [xx XXX xxxx]
+ *) Add call to ENGINE_register_all_complete() to
+ ENGINE_load_builtin_engines(), so some implementations get used
+ automatically instead of needing explicit application support.
+ [Steve Henson]
+
*) Add support for TLS key exporter as described in RFC5705.
[Robin Seggelmann <seggelmann@fh-muenster.de>, Steve Henson]
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)