mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-07 06:17:14 +02:00
main/openssl: add padlock autoload patch back
and clear errors
This reverts commit 29f1e13e6f
.
This commit is contained in:
parent
4793870597
commit
f49f8361fb
@ -0,0 +1,33 @@
|
|||||||
|
From a58658f191e83f4c6417d2cc879fa572f7978537 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||||
|
Date: Thu, 4 Feb 2016 16:28:15 +0100
|
||||||
|
Subject: [PATCH] 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 48ad0d2..822aa23 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 = ENGINE_by_id("padlock");
|
||||||
|
+ if (e != NULL) {
|
||||||
|
+ ENGINE_add(e);
|
||||||
|
+ ENGINE_free(e);
|
||||||
|
+ ERR_clear_error();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
ENGINE_register_all_complete();
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.7.0
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
# Maintainer: Timo Teras <timo.teras@iki.fi>
|
# Maintainer: Timo Teras <timo.teras@iki.fi>
|
||||||
pkgname=openssl
|
pkgname=openssl
|
||||||
pkgver=1.0.2f
|
pkgver=1.0.2f
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
|
pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
|
||||||
url="http://openssl.org"
|
url="http://openssl.org"
|
||||||
depends=
|
depends=
|
||||||
|
Loading…
Reference in New Issue
Block a user