diff options
Diffstat (limited to 'meta-oe/recipes-crypto/pkcs11-helper')
| -rw-r--r-- | meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb (renamed from meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb) | 13 |
2 files changed, 6 insertions, 34 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 deleted file mode 100644 index f2baae9149..0000000000 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper/0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch +++ /dev/null @@ -1,27 +0,0 @@ -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-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb index 1af9004fea..d3922cf79e 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.27.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb @@ -6,22 +6,21 @@ certificates, or selecting a certificate directly by serialized id, handling \ card removal and card insert events, handling card ie-insert to a different \ slot, supporting session expiration and much more all using a simple API." -HOMEPAGE = "http://www.opensc-project.org/pkcs11-helper/" +HOMEPAGE = "https://github.com/OpenSC/pkcs11-helper" SECTION = "Development/Libraries" -LICENSE = "GPLv2 & BSD" +LICENSE = "GPL-2.0-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://COPYING;md5=30f10d22cfb1ba98ccd714a41ad3311a \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ file://COPYING.BSD;md5=66b7a37c3c10483c1fd86007726104d7 \ " -SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https \ - file://0001-build-openssl-remove-RSA_SSLV23_PADDING-constant-usa.patch \ - " +SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" -# v1.27 -SRCREV = "564a582d600c7eec7b8e303a22b575fd52622174" +# master +SRCREV = "8bed16034f629a0361fa8ff89deed2b43dc45d8b" +PV .= "+1.30.0+git" UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)" |