diff options
| author | Roy Li <rongqing.li@windriver.com> | 2015-05-22 17:16:02 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-23 07:56:20 +0100 |
| commit | f7d186abca6ed9b48ae7393b8f244e1bfb46cb41 (patch) | |
| tree | 907d10e2cec1dd147ef67e6c89125deaafc87178 | |
| parent | c218dbb727b829342ef53cb7f1b8278d1a41bb1d (diff) | |
| download | openembedded-core-f7d186abca6ed9b48ae7393b8f244e1bfb46cb41.tar.gz openembedded-core-f7d186abca6ed9b48ae7393b8f244e1bfb46cb41.tar.bz2 openembedded-core-f7d186abca6ed9b48ae7393b8f244e1bfb46cb41.zip | |
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@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 |
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 @@ - -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 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 \ 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 \ |