From f071498cb48add9f47ff4425415e0cf97f44fbb6542ef4a2887eb5c235b83dce Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Mon, 15 Aug 2011 07:41:52 +0000
Subject: [PATCH] Accepting request 78686 from Base:System

- Add upstream patch that calls ENGINE_register_all_complete()
  in ENGINE_load_builtin_engines() saving us from adding dozens
  of calls to such function to calling applications. (forwarded request 78169 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/78686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=65
---
 openssl-call-engine-reg-comp.patch | 24 ++++++++++++++++++++++++
 openssl.changes                    |  7 +++++++
 openssl.spec                       |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 openssl-call-engine-reg-comp.patch

diff --git a/openssl-call-engine-reg-comp.patch b/openssl-call-engine-reg-comp.patch
new file mode 100644
index 0000000..bf4cd6d
--- /dev/null
+++ b/openssl-call-engine-reg-comp.patch
@@ -0,0 +1,24 @@
+Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(), this means that some implementations will be used automatically, e.g. aesni,
+Setup cpuid in ENGINE_load_builtin_engines() too as some ENGINEs use it.
+Origin: UPSTREAM
+URL: http://cvs.openssl.org/chngview?cn=19781
+
+--- crypto/engine/eng_all.c.orig
++++ 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__) || defined(HAVE_CRYPTODEV)
diff --git a/openssl.changes b/openssl.changes
index 5125500..063411c 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Aug  6 00:33:47 UTC 2011 - crrodriguez@opensuse.org
+
+- Add upstream patch that calls ENGINE_register_all_complete()
+  in ENGINE_load_builtin_engines() saving us from adding dozens
+  of calls to such function to calling applications. 
+
 -------------------------------------------------------------------
 Fri Aug  5 19:09:42 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/openssl.spec b/openssl.spec
index ae4d16d..bee5914 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -51,6 +51,7 @@ Patch2:         bug610223.patch
 Patch7:         openssl-1.0.0b-aesni.patch
 #Patch8:         CVE-2011-0014.patch
 Patch9:         ECDSA_signatures_timing_attack.patch
+Patch10:        openssl-call-engine-reg-comp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -188,6 +189,7 @@ Authors:
 %patch7 -p1
 #%patch8 -p1
 %patch9 -p1
+%patch10
 cp -p %{S:10} .
 echo "adding/overwriting some entries in the 'table' hash in Configure"
 # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags