[oe-commits] Roy Li : openssl: drop the padlock_conf.patch
git at git.openembedded.org
git at git.openembedded.org
Sat May 23 07:15:17 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: f7d186abca6ed9b48ae7393b8f244e1bfb46cb41
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f7d186abca6ed9b48ae7393b8f244e1bfb46cb41
Author: Roy Li <rongqing.li at windriver.com>
Date: Fri May 22 17:16:02 2015 +0800
openssl: drop the padlock_conf.patch
padlock_conf.patch will enable the padlock engine by default,
but this engine does not work on some 32bit machine, and lead
to openssl unable to work
Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
.../openssl/openssl/debian1.0.2/padlock_conf.patch | 31 ----------------------
.../recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 -
2 files changed, 32 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch
deleted file mode 100644
index 61dcf45..0000000
--- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Upstream-Status: Backport [debian]
-
---- openssl/apps/openssl.cnf.orig 2012-06-06 00:45:56.000000000 +0200
-+++ openssl/apps/openssl.cnf 2012-06-06 00:46:46.000000000 +0200
-@@ -19,6 +19,8 @@
- # (Alternatively, use a configuration file that has only
- # X.509v3 extensions in its main [= default] section.)
-
-+openssl_conf = openssl_def
-+
- [ new_oids ]
-
- # We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
-@@ -348,3 +350,16 @@
- # (optional, default: no)
- ess_cert_id_chain = no # Must the ESS cert id chain be included?
- # (optional, default: no)
-+
-+[openssl_def]
-+engines = engine_section
-+
-+[engine_section]
-+padlock = padlock_section
-+
-+[padlock_section]
-+soft_load=1
-+init=1
-+default_algorithms = ALL
-+dynamic_path=padlock
-+
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
index 9a218be..0a04aea 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
@@ -18,7 +18,6 @@ SRC_URI += "file://configure-targets.patch \
file://openssl-fix-link.patch \
file://debian1.0.2/block_diginotar.patch \
file://debian1.0.2/block_digicert_malaysia.patch \
- file://debian1.0.2/padlock_conf.patch \
file://debian/ca.patch \
file://debian/c_rehash-compat.patch \
file://debian/debian-targets.patch \
More information about the Openembedded-commits
mailing list