From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 21 Jul 2010 16:23:59 +0000 (+0000)
Subject: Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(),
X-Git-Tag: OpenSSL_1_0_1-beta1~489
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=160f9b5bf6f661695d851e61be349e320d8f633d;p=oweals%2Fopenssl.git

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 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)