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 6b5e116c3a579b030b595a7d5966c996eea63d37..7005f1cd892fe6e117abc064276c2cd6e1b78741 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -96,6 +96,11 @@
   
  Changes between 1.0.0 and 1.0.1  [xx XXX xxxx]
 
   
  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]
 
   *) 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 b03fa47867967a1679583150cc2a062dfbf8a451..5cd2d87f6706e4d882b90e2c21ac021d93b60f94 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -61,6 +61,8 @@
 
 void ENGINE_load_builtin_engines(void)
        {
 
 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
 #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_load_capi();
 #endif
 #endif

+       ENGINE_register_all_complete();

        }
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
        }
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__)