summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-10-11 20:41:28 +0200
committerKhem Raj <raj.khem@gmail.com>2021-10-14 07:16:58 -0700
commite8f84f780368319799ce55b012069fff3ddf0f48 (patch)
treefaa002f2893c15de8287162fd4d84ae1cf6c639b /meta-oe
parent38303c7063ccffd82c00ad6202f59e00aabb44f4 (diff)
downloadmeta-openembedded-e8f84f780368319799ce55b012069fff3ddf0f48.tar.gz
pkcs11-helper: backport a openssl 3.x patch
Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch27
-rw-r--r--meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb4
2 files changed, 30 insertions, 1 deletions
diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch
new file mode 100644
index 000000000..f2baae914
--- /dev/null
+++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch
@@ -0,0 +1,27 @@
1From 5b9a8da964ee0b998955cd986000cfa27cfa698d Mon Sep 17 00:00:00 2001
2From: Alon Bar-Lev <alon.barlev@gmail.com>
3Date: Wed, 4 Aug 2021 19:02:34 +0300
4Subject: [PATCH] build: openssl: remove RSA_SSLV23_PADDING constant usage
5
6Due to openssl-3 compatibility, thanks to t0b3
7
8Upstream-Status: Backport
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10---
11 lib/pkcs11h-openssl.c | 3 ---
12 1 file changed, 3 deletions(-)
13
14diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
15index 9c9b2cd..85c8193 100644
16--- a/lib/pkcs11h-openssl.c
17+++ b/lib/pkcs11h-openssl.c
18@@ -474,9 +474,6 @@ __pkcs11h_openssl_rsa_dec (
19 case RSA_PKCS1_OAEP_PADDING:
20 mech = CKM_RSA_PKCS_OAEP;
21 break;
22- case RSA_SSLV23_PADDING:
23- rv = CKR_MECHANISM_INVALID;
24- break;
25 case RSA_NO_PADDING:
26 mech = CKM_RSA_X_509;
27 break;
diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb
index a7365f193..944f49fc7 100644
--- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb
+++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb
@@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = " \
15 file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ 15 file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \
16 file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ 16 file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \
17" 17"
18SRC_URI = "git://github.com/OpenSC/${BPN}.git" 18SRC_URI = "git://github.com/OpenSC/${BPN}.git \
19 file://0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch \
20 "
19 21
20S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
21# v1.27 23# v1.27