diff --git a/.gitignore b/.gitignore index 6f3f113..e23dc51 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ pkcs11-helper-1.07.tar.bz2 /pkcs11-helper-1.09.tar.bz2 /pkcs11-helper-1.10.tar.bz2 /pkcs11-helper-1.11.tar.bz2 +/pkcs11-helper-1.22.tar.bz2 diff --git a/0001-certificate-ignore-certificates-without-CKA_ID.patch b/0001-certificate-ignore-certificates-without-CKA_ID.patch deleted file mode 100644 index d42120b..0000000 --- a/0001-certificate-ignore-certificates-without-CKA_ID.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8d81cf6b460c0443c64605fe9ab0137c12c1ccba Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Mon, 30 Dec 2013 20:17:13 +0200 -Subject: [PATCH] certificate: ignore certificates without CKA_ID - -we won't be able to retrieve them anyway. - -Signed-off-by: Alon Bar-Lev ---- - ChangeLog | 1 + - lib/pkcs11h-certificate.c | 19 ++++++++++++++++++- - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/lib/pkcs11h-certificate.c b/lib/pkcs11h-certificate.c -index 086e22d..6eb95e2 100644 ---- a/lib/pkcs11h-certificate.c -+++ b/lib/pkcs11h-certificate.c -@@ -2383,7 +2383,24 @@ _pkcs11h_certificate_enumSessionCertificates ( - objects[i], - attrs, - sizeof (attrs) / sizeof (CK_ATTRIBUTE) -- )) != CKR_OK || -+ )) != CKR_OK -+ ) { -+ goto retry1; -+ } -+ -+ /* -+ * skip objects without CKA_ID as we -+ * won't be able to retrieve them. -+ */ -+ if ( -+ attrs[0].pValue == NULL || -+ attrs[0].ulValueLen == 0 -+ ) { -+ rv = CKR_OK; -+ goto retry1; -+ } -+ -+ if ( - (rv = _pkcs11h_certificate_newCertificateId (&certificate_id)) != CKR_OK || - (rv = pkcs11h_token_duplicateTokenId ( - &certificate_id->token_id, --- -2.1.0 - diff --git a/pkcs11-helper.spec b/pkcs11-helper.spec index 6a2c8ad..0670302 100644 --- a/pkcs11-helper.spec +++ b/pkcs11-helper.spec @@ -1,13 +1,12 @@ Name: pkcs11-helper -Version: 1.11 -Release: 9%{?dist} +Version: 1.22 +Release: 1%{?dist} Summary: A library for using PKCS#11 providers Group: System Environment/Libraries License: GPLv2 or BSD URL: http://www.opensc-project.org/opensc/wiki/pkcs11-helper Source0: http://downloads.sourceforge.net/opensc/pkcs11-helper-%{version}.tar.bz2 -Patch1: 0001-certificate-ignore-certificates-without-CKA_ID.patch Patch2: pkcs11-helper-rfc7512.patch BuildRequires: doxygen graphviz @@ -37,7 +36,6 @@ programs using the pkcs11-helper library. %prep %setup -q -%patch1 -p1 %patch2 -p1 %build @@ -77,6 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Tue Feb 21 2017 Nikos Mavrogiannopoulos - 1.22-1 +- New upstream release + * Sat Feb 11 2017 Fedora Release Engineering - 1.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 109493a..9760f06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59f2ac76c66e4dc0c21614cc944e89fb pkcs11-helper-1.11.tar.bz2 +SHA512 (pkcs11-helper-1.22.tar.bz2) = f17b3e1079cd226437b5b7eb6176c5b49db00e91419b405b097badaf166c79c7e06f5792f81bcd0d44c4c695549c3c1d61c25ca57caf3758dd4c3a6b5a94c928