diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-crypto')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.1.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb) | 7 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch | 27 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb | 4 |
3 files changed, 35 insertions, 3 deletions
diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.1.bb index 806a05e8f2..7f7c350a63 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.1.bb @@ -14,11 +14,14 @@ DEPENDS = " \ libdevmapper \ popt \ util-linux-libuuid \ + libssh \ " +DEPENDS:append:libc-musl = " argp-standalone" +LDFLAGS:append:libc-musl = " -largp" + SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "504d1ab22cbc4d1a59a8d8c7ee5ed3bf" -SRC_URI[sha256sum] = "b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f" +SRC_URI[sha256sum] = "a356a727a83a464ade566e95239622a22dbe4e0f482b198fdb04ab0d3a5a9c5f" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch new file mode 100644 index 0000000000..f2baae9149 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch @@ -0,0 +1,27 @@ +From 5b9a8da964ee0b998955cd986000cfa27cfa698d Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <alon.barlev@gmail.com> +Date: Wed, 4 Aug 2021 19:02:34 +0300 +Subject: [PATCH] build: openssl: remove RSA_SSLV23_PADDING constant usage + +Due to openssl-3 compatibility, thanks to t0b3 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + lib/pkcs11h-openssl.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c +index 9c9b2cd..85c8193 100644 +--- a/lib/pkcs11h-openssl.c ++++ b/lib/pkcs11h-openssl.c +@@ -474,9 +474,6 @@ __pkcs11h_openssl_rsa_dec ( + case RSA_PKCS1_OAEP_PADDING: + mech = CKM_RSA_PKCS_OAEP; + break; +- case RSA_SSLV23_PADDING: +- rv = CKR_MECHANISM_INVALID; +- break; + case RSA_NO_PADDING: + mech = CKM_RSA_X_509; + break; diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb index a7365f193a..944f49fc78 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb @@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ " -SRC_URI = "git://github.com/OpenSC/${BPN}.git" +SRC_URI = "git://github.com/OpenSC/${BPN}.git \ + file://0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch \ + " S = "${WORKDIR}/git" # v1.27 |