summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-07-29 18:11:18 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:14 -0300
commitca37332938accb840b120648ba7434dbead7b464 (patch)
tree5defc488f8f130ed866fce97bf884ca290282a13 /recipes-connectivity
parent5d7917902628b84919ac9dfc332fd46a4d579e60 (diff)
downloadmeta-freescale-ca37332938accb840b120648ba7434dbead7b464.tar.gz
openssl: Avoid contamination OE-Core recipe
The QorIQ version of openssl needs to use another recipe name and have a common provider, which is than choosen for QorIQ-based machines. The recipe is now called 'openssl-qoriq' and it provides openssl so the preferrence is set just for QorIQ based machines. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq.inc (renamed from recipes-connectivity/openssl/openssl.inc)0
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb98
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0003-cryptodev-fix-algorithm-registration.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0003-cryptodev-fix-algorithm-registration.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0005-ECC-Support-header-for-Cryptodev-Engine.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0006-Fixed-private-key-support-for-DH.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0006-Fixed-private-key-support-for-DH.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0007-Fixed-private-key-support-for-DH.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0007-Fixed-private-key-support-for-DH.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0008-Initial-support-for-PKC-in-cryptodev-engine.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0009-Added-hwrng-dev-file-as-source-of-RNG.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0012-RSA-Keygen-Fix.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0012-RSA-Keygen-Fix.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0013-Removed-local-copy-of-curve_t-type.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0013-Removed-local-copy-of-curve_t-type.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0014-Modulus-parameter-is-not-populated-by-dhparams.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0015-SW-Backoff-mechanism-for-dsa-keygen.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0016-Fixed-DH-keygen-pair-generator.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0016-Fixed-DH-keygen-pair-generator.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0021-cryptodev-drop-redundant-function.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0021-cryptodev-drop-redundant-function.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0022-cryptodev-do-not-zero-the-buffer-before-use.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0023-cryptodev-clean-up-code-layout.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0025-cryptodev-put_dev_crypto-should-be-an-int.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl/qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch (renamed from recipes-connectivity/openssl/openssl-fsl/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch)0
-rw-r--r--recipes-connectivity/openssl/openssl_1.0.1i.bb53
-rw-r--r--recipes-connectivity/openssl/openssl_1.0.1i.bbappend40
30 files changed, 98 insertions, 93 deletions
diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl-qoriq.inc
index ee02fb79..ee02fb79 100644
--- a/recipes-connectivity/openssl/openssl.inc
+++ b/recipes-connectivity/openssl/openssl-qoriq.inc
diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb b/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb
new file mode 100644
index 00000000..b4d5cd46
--- /dev/null
+++ b/recipes-connectivity/openssl/openssl-qoriq_1.0.1i.bb
@@ -0,0 +1,98 @@
1require openssl-qoriq.inc
2
3# For target side versions of openssl enable support for cryptodev Linux driver
4# if they are available.
5DEPENDS_class-target += "cryptodev-linux"
6CFLAG_class-target += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
9
10export DIRS = "crypto ssl apps engines"
11export OE_LDFLAGS="${LDFLAGS}"
12
13PROVIDES = "openssl"
14
15SRC_URI += "file://configure-targets.patch \
16 file://shared-libs.patch \
17 file://oe-ldflags.patch \
18 file://engines-install-in-libdir-ssl.patch \
19 file://openssl-fix-link.patch \
20 file://debian/version-script.patch \
21 file://debian/pic.patch \
22 file://debian/c_rehash-compat.patch \
23 file://debian/ca.patch \
24 file://debian/make-targets.patch \
25 file://debian/no-rpath.patch \
26 file://debian/man-dir.patch \
27 file://debian/man-section.patch \
28 file://debian/no-symbolic.patch \
29 file://debian/debian-targets.patch \
30 file://openssl_fix_for_x32.patch \
31 file://fix-cipher-des-ede3-cfb1.patch \
32 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
33 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
34 file://initial-aarch64-bits.patch \
35 file://find.pl \
36 file://openssl-fix-des.pod-error.patch \
37 "
38
39SRC_URI_append_class-target = "\
40 file://qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch \
41 file://qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch \
42 file://qoriq/0003-cryptodev-fix-algorithm-registration.patch \
43 file://qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch \
44 file://qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch \
45 file://qoriq/0006-Fixed-private-key-support-for-DH.patch \
46 file://qoriq/0007-Fixed-private-key-support-for-DH.patch \
47 file://qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch \
48 file://qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch \
49 file://qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch \
50 file://qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch \
51 file://qoriq/0012-RSA-Keygen-Fix.patch \
52 file://qoriq/0013-Removed-local-copy-of-curve_t-type.patch \
53 file://qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch \
54 file://qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch \
55 file://qoriq/0016-Fixed-DH-keygen-pair-generator.patch \
56 file://qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch \
57 file://qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch \
58 file://qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch \
59 file://qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch \
60 file://qoriq/0021-cryptodev-drop-redundant-function.patch \
61 file://qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch \
62 file://qoriq/0023-cryptodev-clean-up-code-layout.patch \
63 file://qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch \
64 file://qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch \
65 file://qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch \
66"
67
68SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972"
69SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"
70
71PACKAGES =+ " \
72 ${PN}-engines-dbg \
73 ${PN}-engines \
74"
75
76FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
77FILES_${PN}-engines-dbg = "${libdir}/engines/.debug ${libdir}/ssl/engines/.debug"
78
79PARALLEL_MAKE = ""
80PARALLEL_MAKEINST = ""
81
82# Digest offloading through cryptodev is not recommended because of the
83# performance penalty of the Openssl engine interface. Openssl generates a huge
84# number of calls to digest functions for even a small amount of work data.
85# For example there are 70 calls to cipher code and over 10000 to digest code
86# when downloading only 10 files of 700 bytes each.
87# Do not build OpenSSL with cryptodev digest support until engine digest
88# interface gets some rework:
89CFLAG_class-target := "${@'${CFLAG}'.replace('-DUSE_CRYPTODEV_DIGESTS', '')}"
90
91do_configure_prepend() {
92 cp ${WORKDIR}/find.pl ${S}/util/find.pl
93}
94
95
96RDEPENDS_${PN}_class-target += "cryptodev-module"
97
98COMPATIBLE_MACHINE = "(qoriq-arm|qoriq-ppc)"
diff --git a/recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
index e7b874f5..e7b874f5 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0001-remove-double-initialization-of-cryptodev-engine.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch b/recipes-connectivity/openssl/openssl/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
index ab2b7ea9..ab2b7ea9 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0003-cryptodev-fix-algorithm-registration.patch b/recipes-connectivity/openssl/openssl/qoriq/0003-cryptodev-fix-algorithm-registration.patch
index f0d97e9a..f0d97e9a 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0003-cryptodev-fix-algorithm-registration.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0003-cryptodev-fix-algorithm-registration.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch b/recipes-connectivity/openssl/openssl/qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch
index 2d722d8a..2d722d8a 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0005-ECC-Support-header-for-Cryptodev-Engine.patch b/recipes-connectivity/openssl/openssl/qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch
index c9ff5aa8..c9ff5aa8 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0005-ECC-Support-header-for-Cryptodev-Engine.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0005-ECC-Support-header-for-Cryptodev-Engine.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0006-Fixed-private-key-support-for-DH.patch b/recipes-connectivity/openssl/openssl/qoriq/0006-Fixed-private-key-support-for-DH.patch
index 01c268b6..01c268b6 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0006-Fixed-private-key-support-for-DH.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0006-Fixed-private-key-support-for-DH.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0007-Fixed-private-key-support-for-DH.patch b/recipes-connectivity/openssl/openssl/qoriq/0007-Fixed-private-key-support-for-DH.patch
index 12fcd7df..12fcd7df 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0007-Fixed-private-key-support-for-DH.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0007-Fixed-private-key-support-for-DH.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0008-Initial-support-for-PKC-in-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl/qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch
index 98272abf..98272abf 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0008-Initial-support-for-PKC-in-cryptodev-engine.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0008-Initial-support-for-PKC-in-cryptodev-engine.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0009-Added-hwrng-dev-file-as-source-of-RNG.patch b/recipes-connectivity/openssl/openssl/qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch
index 0fb01821..0fb01821 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0009-Added-hwrng-dev-file-as-source-of-RNG.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0009-Added-hwrng-dev-file-as-source-of-RNG.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch b/recipes-connectivity/openssl/openssl/qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
index 0f889c0f..0f889c0f 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch b/recipes-connectivity/openssl/openssl/qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
index 244d230e..244d230e 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0012-RSA-Keygen-Fix.patch b/recipes-connectivity/openssl/openssl/qoriq/0012-RSA-Keygen-Fix.patch
index 7f907da4..7f907da4 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0012-RSA-Keygen-Fix.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0012-RSA-Keygen-Fix.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0013-Removed-local-copy-of-curve_t-type.patch b/recipes-connectivity/openssl/openssl/qoriq/0013-Removed-local-copy-of-curve_t-type.patch
index c9d8ace8..c9d8ace8 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0013-Removed-local-copy-of-curve_t-type.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0013-Removed-local-copy-of-curve_t-type.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0014-Modulus-parameter-is-not-populated-by-dhparams.patch b/recipes-connectivity/openssl/openssl/qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch
index 198bed70..198bed70 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0014-Modulus-parameter-is-not-populated-by-dhparams.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0014-Modulus-parameter-is-not-populated-by-dhparams.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0015-SW-Backoff-mechanism-for-dsa-keygen.patch b/recipes-connectivity/openssl/openssl/qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch
index 59330a1e..59330a1e 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0015-SW-Backoff-mechanism-for-dsa-keygen.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0015-SW-Backoff-mechanism-for-dsa-keygen.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0016-Fixed-DH-keygen-pair-generator.patch b/recipes-connectivity/openssl/openssl/qoriq/0016-Fixed-DH-keygen-pair-generator.patch
index 8923cb63..8923cb63 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0016-Fixed-DH-keygen-pair-generator.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0016-Fixed-DH-keygen-pair-generator.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch b/recipes-connectivity/openssl/openssl/qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
index bd9e61ac..bd9e61ac 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch b/recipes-connectivity/openssl/openssl/qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
index 1118a6fc..1118a6fc 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch b/recipes-connectivity/openssl/openssl/qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
index 988d79ea..988d79ea 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch b/recipes-connectivity/openssl/openssl/qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
index 7370c496..7370c496 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0021-cryptodev-drop-redundant-function.patch b/recipes-connectivity/openssl/openssl/qoriq/0021-cryptodev-drop-redundant-function.patch
index 16cc6882..16cc6882 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0021-cryptodev-drop-redundant-function.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0021-cryptodev-drop-redundant-function.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0022-cryptodev-do-not-zero-the-buffer-before-use.patch b/recipes-connectivity/openssl/openssl/qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch
index 0b2f0f1b..0b2f0f1b 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0022-cryptodev-do-not-zero-the-buffer-before-use.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0022-cryptodev-do-not-zero-the-buffer-before-use.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch b/recipes-connectivity/openssl/openssl/qoriq/0023-cryptodev-clean-up-code-layout.patch
index 5ff1c5ca..5ff1c5ca 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0023-cryptodev-clean-up-code-layout.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch b/recipes-connectivity/openssl/openssl/qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch
index e798d3e2..e798d3e2 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0024-cryptodev-do-not-cache-file-descriptor-in-open.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0025-cryptodev-put_dev_crypto-should-be-an-int.patch b/recipes-connectivity/openssl/openssl/qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch
index a48dc6a6..a48dc6a6 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0025-cryptodev-put_dev_crypto-should-be-an-int.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0025-cryptodev-put_dev_crypto-should-be-an-int.patch
diff --git a/recipes-connectivity/openssl/openssl-fsl/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch b/recipes-connectivity/openssl/openssl/qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch
index 6527ac8f..6527ac8f 100644
--- a/recipes-connectivity/openssl/openssl-fsl/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch
+++ b/recipes-connectivity/openssl/openssl/qoriq/0026-cryptodev-simplify-cryptodev-pkc-support-code.patch
diff --git a/recipes-connectivity/openssl/openssl_1.0.1i.bb b/recipes-connectivity/openssl/openssl_1.0.1i.bb
deleted file mode 100644
index 9d093efe..00000000
--- a/recipes-connectivity/openssl/openssl_1.0.1i.bb
+++ /dev/null
@@ -1,53 +0,0 @@
1require openssl.inc
2
3# For target side versions of openssl enable support for cryptodev Linux driver
4# if they are available.
5DEPENDS_class-target += "cryptodev-linux"
6CFLAG_class-target += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
9
10export DIRS = "crypto ssl apps engines"
11export OE_LDFLAGS="${LDFLAGS}"
12
13SRC_URI += "file://configure-targets.patch \
14 file://shared-libs.patch \
15 file://oe-ldflags.patch \
16 file://engines-install-in-libdir-ssl.patch \
17 file://openssl-fix-link.patch \
18 file://debian/version-script.patch \
19 file://debian/pic.patch \
20 file://debian/c_rehash-compat.patch \
21 file://debian/ca.patch \
22 file://debian/make-targets.patch \
23 file://debian/no-rpath.patch \
24 file://debian/man-dir.patch \
25 file://debian/man-section.patch \
26 file://debian/no-symbolic.patch \
27 file://debian/debian-targets.patch \
28 file://openssl_fix_for_x32.patch \
29 file://fix-cipher-des-ede3-cfb1.patch \
30 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
31 file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
32 file://initial-aarch64-bits.patch \
33 file://find.pl \
34 file://openssl-fix-des.pod-error.patch \
35 "
36
37SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972"
38SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"
39
40PACKAGES =+ " \
41 ${PN}-engines-dbg \
42 ${PN}-engines \
43"
44
45FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
46FILES_${PN}-engines-dbg = "${libdir}/engines/.debug ${libdir}/ssl/engines/.debug"
47
48PARALLEL_MAKE = ""
49PARALLEL_MAKEINST = ""
50
51do_configure_prepend() {
52 cp ${WORKDIR}/find.pl ${S}/util/find.pl
53}
diff --git a/recipes-connectivity/openssl/openssl_1.0.1i.bbappend b/recipes-connectivity/openssl/openssl_1.0.1i.bbappend
deleted file mode 100644
index 7b381ffb..00000000
--- a/recipes-connectivity/openssl/openssl_1.0.1i.bbappend
+++ /dev/null
@@ -1,40 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/openssl-fsl:"
2
3RDEPENDS_${PN}_class-target += "cryptodev-module"
4
5SRC_URI_append_class-target = " file://0001-remove-double-initialization-of-cryptodev-engine.patch \
6 file://0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch \
7 file://0003-cryptodev-fix-algorithm-registration.patch \
8 file://0004-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch \
9 file://0005-ECC-Support-header-for-Cryptodev-Engine.patch \
10 file://0006-Fixed-private-key-support-for-DH.patch \
11 file://0007-Fixed-private-key-support-for-DH.patch \
12 file://0008-Initial-support-for-PKC-in-cryptodev-engine.patch \
13 file://0009-Added-hwrng-dev-file-as-source-of-RNG.patch \
14 file://0010-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch \
15 file://0011-Add-RSA-keygen-operation-and-support-gendsa-command-.patch \
16 file://0012-RSA-Keygen-Fix.patch \
17 file://0013-Removed-local-copy-of-curve_t-type.patch \
18 file://0014-Modulus-parameter-is-not-populated-by-dhparams.patch \
19 file://0015-SW-Backoff-mechanism-for-dsa-keygen.patch \
20 file://0016-Fixed-DH-keygen-pair-generator.patch \
21 file://0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch \
22 file://0018-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch \
23 file://0019-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch \
24 file://0020-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch \
25 file://0021-cryptodev-drop-redundant-function.patch \
26 file://0022-cryptodev-do-not-zero-the-buffer-before-use.patch \
27 file://0023-cryptodev-clean-up-code-layout.patch \
28 file://0024-cryptodev-do-not-cache-file-descriptor-in-open.patch \
29 file://0025-cryptodev-put_dev_crypto-should-be-an-int.patch \
30 file://0026-cryptodev-simplify-cryptodev-pkc-support-code.patch \
31"
32
33# Digest offloading through cryptodev is not recommended because of the
34# performance penalty of the Openssl engine interface. Openssl generates a huge
35# number of calls to digest functions for even a small amount of work data.
36# For example there are 70 calls to cipher code and over 10000 to digest code
37# when downloading only 10 files of 700 bytes each.
38# Do not build OpenSSL with cryptodev digest support until engine digest
39# interface gets some rework:
40CFLAG_class-target := "${@'${CFLAG}'.replace('-DUSE_CRYPTODEV_DIGESTS', '')}"