diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-02-05 09:46:51 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-02-23 09:31:04 +0200 |
| commit | 702892b19b022a42183170314d5ba9f2774baf7c (patch) | |
| tree | 795a73d491330bcae3c44ee7bab5fab40b88e11b /main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch | |
| parent | de31a22f0f21b10ef4f8f4d5fc8597a8b2aff497 (diff) | |
| download | aports-702892b19b022a42183170314d5ba9f2774baf7c.tar.bz2 aports-702892b19b022a42183170314d5ba9f2774baf7c.tar.xz | |
main/openssl: upgrade to 1.0.2 and rebase all patches
Diffstat (limited to 'main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch')
| -rw-r--r-- | main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch deleted file mode 100644 index f83fc965e0..0000000000 --- a/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 21668119c0f83f309b423b8a443dbef5206ab778 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Fri, 4 Jun 2010 18:02:39 +0300 -Subject: [PATCH 4/4] crypto/engine: autoload padlock dynamic engine - ---- - crypto/engine/eng_all.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c -index 6093376..210b2d7 100644 ---- a/crypto/engine/eng_all.c -+++ b/crypto/engine/eng_all.c -@@ -120,6 +120,16 @@ void ENGINE_load_builtin_engines(void) - ENGINE_load_capi(); - #endif - #endif -+#ifdef OPENSSL_NO_STATIC_ENGINE -+ { -+ ENGINE *e; -+ e = ENGINE_by_id("padlock"); -+ if (e != NULL) { -+ ENGINE_add(e); -+ ENGINE_free(e); -+ } -+ } -+#endif - ENGINE_register_all_complete(); - } - --- -1.7.11.3 - |