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.

diff --git a/CHANGES b/CHANGES
index 17f83c4750cabbbd89733d67f7a76b5c2e4c889c..3ebb5b28c8fb8dd45fa188c5ff20ddd9b3d6d64e 100644 (file)
--- 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 22c120454f13dac85b2eb1c4c26a2c4f837fa5af..3f5d100de22330a663d10a3424ab1837a346caea 100644 (file)
--- 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)