diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-08-02 17:20:47 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-08-02 17:23:40 +0300 |
| commit | cdbddc83dc90972ef93e2cbf8bd706d0e0ab129f (patch) | |
| tree | 23d27eff2ee7aebf1a6297a41217d1b39fa1c28c /main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch | |
| parent | ffb1c7b4dc64a49a5c873e9a119e3da57f1a5e86 (diff) | |
| download | aports-cdbddc83dc90972ef93e2cbf8bd706d0e0ab129f.tar.bz2 aports-cdbddc83dc90972ef93e2cbf8bd706d0e0ab129f.tar.xz | |
main/openssl: refresh hmac/oneshot and padlock patches
* fixed hmac oneshot flag to work as expected
* renamed the patch series, and rebased against 1.0.1c
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, 33 insertions, 0 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 new file mode 100644 index 0000000000..f83fc965e0 --- /dev/null +++ b/main/openssl/0004-crypto-engine-autoload-padlock-dynamic-engine.patch @@ -0,0 +1,33 @@ +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 + |