summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-05-22 17:16:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-24 07:19:19 +0100
commita497998f9ea2533c3ac19afcc05e4628c4decfd7 (patch)
treeba88fdb1e7bc8b08fa11832523846ffb399f759f
parentea2428a561c2ae1552a97932231d437cdd49ee96 (diff)
downloadpoky-a497998f9ea2533c3ac19afcc05e4628c4decfd7.tar.gz
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 (From OE-Core rev: f7d186abca6ed9b48ae7393b8f244e1bfb46cb41) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch31
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2a.bb1
2 files changed, 0 insertions, 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 61dcf457fe..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1
2Upstream-Status: Backport [debian]
3
4--- openssl/apps/openssl.cnf.orig 2012-06-06 00:45:56.000000000 +0200
5+++ openssl/apps/openssl.cnf 2012-06-06 00:46:46.000000000 +0200
6@@ -19,6 +19,8 @@
7 # (Alternatively, use a configuration file that has only
8 # X.509v3 extensions in its main [= default] section.)
9
10+openssl_conf = openssl_def
11+
12 [ new_oids ]
13
14 # We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
15@@ -348,3 +350,16 @@
16 # (optional, default: no)
17 ess_cert_id_chain = no # Must the ESS cert id chain be included?
18 # (optional, default: no)
19+
20+[openssl_def]
21+engines = engine_section
22+
23+[engine_section]
24+padlock = padlock_section
25+
26+[padlock_section]
27+soft_load=1
28+init=1
29+default_algorithms = ALL
30+dynamic_path=padlock
31+
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
index 9a218be605..0a04aeaaaa 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 \
18 file://openssl-fix-link.patch \ 18 file://openssl-fix-link.patch \
19 file://debian1.0.2/block_diginotar.patch \ 19 file://debian1.0.2/block_diginotar.patch \
20 file://debian1.0.2/block_digicert_malaysia.patch \ 20 file://debian1.0.2/block_digicert_malaysia.patch \
21 file://debian1.0.2/padlock_conf.patch \
22 file://debian/ca.patch \ 21 file://debian/ca.patch \
23 file://debian/c_rehash-compat.patch \ 22 file://debian/c_rehash-compat.patch \
24 file://debian/debian-targets.patch \ 23 file://debian/debian-targets.patch \