diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-04 12:25:39 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-04 15:46:16 +0100 |
commit | 29f1e13e6f54c24c5fac520555da38e763c6c45b (patch) | |
tree | e3779739858cf38ccf5760a4f42ced0c4020fc48 /main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch | |
parent | fb4292589ac71706a0e79248041e6fd830c9d920 (diff) | |
download | aports-29f1e13e6f54c24c5fac520555da38e763c6c45b.tar.bz2 aports-29f1e13e6f54c24c5fac520555da38e763c6c45b.tar.xz |
main/openssl: remove padlock autoload patch
it appears they made padlock static upstream again
this fixes nodejs issues
ref #4999
Diffstat (limited to 'main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch')
-rw-r--r-- | main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch deleted file mode 100644 index d0cdfb3b3a..0000000000 --- a/main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - |