From ecf8efb292fb410ab8080891fb017d4a01ef3cd5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Jul 2022 00:39:29 +0200 Subject: [PATCH] package/libp11: bump to version 0.4.12 - Drop patch (already in version) - This bump will also fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: p11_cert.c: In function 'pkcs11_store_certificate': p11_cert.c:310:34: error: dereferencing pointer to incomplete type 'X509' {aka 'struct x509_st'} 310 | signature_nid = OBJ_obj2nid(x509->sig_alg->algorithm); | ^~ https://github.com/OpenSC/libp11/releases/tag/libp11-0.4.12 Fixes: - http://autobuild.buildroot.org/results/3acfa1419b59f7daa58fa8e61abc63ecb00f853c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 86ab91483dcb4b60de8c1daa20e2f42bd95ab5fb) Signed-off-by: Peter Korsgaard --- package/libp11/0001-Update-wp11_rsa.c.patch | 26 --------------------- package/libp11/libp11.hash | 2 +- package/libp11/libp11.mk | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 package/libp11/0001-Update-wp11_rsa.c.patch diff --git a/package/libp11/0001-Update-wp11_rsa.c.patch b/package/libp11/0001-Update-wp11_rsa.c.patch deleted file mode 100644 index 0a2d6e65ce..0000000000 --- a/package/libp11/0001-Update-wp11_rsa.c.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4968cfc64dbaa39bb479a24d9578d75099e2f337 Mon Sep 17 00:00:00 2001 -From: patchMonkey156 -Date: Mon, 19 Oct 2020 17:12:15 -0400 -Subject: [PATCH] Update p11_rsa.c - -Bugfix for new LibreSSL version 3.2.2 -[Retrieved from: -https://github.com/OpenSC/libp11/commit/4968cfc64dbaa39bb479a24d9578d75099e2f337] -Signed-off-by: Fabrice Fontaine ---- - src/p11_rsa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/p11_rsa.c b/src/p11_rsa.c -index b6beef0..ff12ed7 100644 ---- a/src/p11_rsa.c -+++ b/src/p11_rsa.c -@@ -336,7 +336,7 @@ int pkcs11_get_key_size(PKCS11_KEY *key) - return RSA_size(rsa); - } - --#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER) -+#if ( ( defined (OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100005L ) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3020199L ) ) - - int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth)) - (int flen, const unsigned char *from, diff --git a/package/libp11/libp11.hash b/package/libp11/libp11.hash index 52d73d4206..0e42bdd4cf 100644 --- a/package/libp11/libp11.hash +++ b/package/libp11/libp11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 57d47a12a76fd92664ae30032cf969284ebac1dfc25bf824999d74b016d51366 libp11-0.4.11.tar.gz +sha256 1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd libp11-0.4.12.tar.gz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index c1873a920c..7718573ace 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBP11_VERSION = 0.4.11 +LIBP11_VERSION = 0.4.12 LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION) LIBP11_DEPENDENCIES = openssl host-pkgconf LIBP11_INSTALL_STAGING = YES