summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-07-21 16:14:48 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-07-21 16:14:48 +0000
commit7bbd0de88dd179be6171ecf9e190561127cdd15f (patch)
tree43952eb7c05c240a1bb8cbfec9e0a138ac9a59ba
parentf96ccf36ffa4ac9941c4f00eda2e970be6b2e5da (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.
-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 6b5e116c3a..7005f1cd89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -96,6 +96,11 @@
Changes between 1.0.0 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 b03fa47867..5cd2d87f67 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
@@ -115,6 +117,7 @@ void ENGINE_load_builtin_engines(void)
ENGINE_load_capi();
#endif
#endif
+ ENGINE_register_all_complete();
}
#if defined(__OpenBSD__) || defined(__FreeBSD__)