summaryrefslogtreecommitdiffstats
path: root/main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-02-23 09:33:42 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-02-23 09:33:42 +0200
commit840920fa28ef54c3caa08be40253e1c9b5169d3d (patch)
tree9aa35a53f76a820aec5f82009314793b5ee220b2 /main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch
parent702892b19b022a42183170314d5ba9f2774baf7c (diff)
main/openssl: add missing patches
Diffstat (limited to 'main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch')
-rw-r--r--main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch
new file mode 100644
index 00000000000..d0cdfb3b3ab
--- /dev/null
+++ b/main/openssl/0012-crypto-engine-autoload-padlock-dynamic-engine.patch
@@ -0,0 +1,32 @@
+From a358a1267644829144d6ad35116733ceeef46bf1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Thu, 5 Feb 2015 09:43:37 +0200
+Subject: [PATCH] crypto/engine: autoload padlock dynamic engine
+
+---
+ crypto/engine/eng_all.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
+index 195a3a9..bd05e4c 100644
+--- a/crypto/engine/eng_all.c
++++ b/crypto/engine/eng_all.c
+@@ -120,6 +120,15 @@ void ENGINE_load_builtin_engines(void)
+ ENGINE_load_capi();
+ # endif
+ #endif
++#ifdef OPENSSL_NO_STATIC_ENGINE
++ {
++ ENGINE *e = ENGINE_by_id("padlock");
++ if (e != NULL) {
++ ENGINE_add(e);
++ ENGINE_free(e);
++ }
++ }
++#endif
+ ENGINE_register_all_complete();
+ }
+
+--
+2.2.2
+