- new version 0.20.3
* Fix problems reinitializing managed modules after fork * Fix bad bookeeping when fail initializing one of the modules * Fix case where module would be unloaded while in use [#74919] * Remove assertions when module used before initialized [#74919] * Fix handling of mmap failure and mapping empty files [#74773] * Stable p11_kit_be_quiet() and p11_kit_be_loud() functions * Require automake 1.12 or later * Build fixes for Windows [#76594 #74149] OBS-URL: https://build.opensuse.org/package/show/Base:System/p11-kit?expand=0&rev=15
This commit is contained in:
parent
50451b628b
commit
8af1cf2f17
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:04ed51d92fc46c2b632e13d73e0293090e9f8aa29c8aa8c6bc95c12475e5ef7c
|
|
||||||
size 979999
|
|
Binary file not shown.
3
p11-kit-0.20.3.tar.gz
Normal file
3
p11-kit-0.20.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b77032bc68c24e6c3cfd8cb340a4a3bb8b7d62a7c659dae08e9b6bb7287193c3
|
||||||
|
size 1171155
|
BIN
p11-kit-0.20.3.tar.gz.sig
Normal file
BIN
p11-kit-0.20.3.tar.gz.sig
Normal file
Binary file not shown.
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 29 06:47:50 UTC 2014 - lnussel@suse.de
|
||||||
|
|
||||||
|
- new version 0.20.3
|
||||||
|
* Fix problems reinitializing managed modules after fork
|
||||||
|
* Fix bad bookeeping when fail initializing one of the modules
|
||||||
|
* Fix case where module would be unloaded while in use [#74919]
|
||||||
|
* Remove assertions when module used before initialized [#74919]
|
||||||
|
* Fix handling of mmap failure and mapping empty files [#74773]
|
||||||
|
* Stable p11_kit_be_quiet() and p11_kit_be_loud() functions
|
||||||
|
* Require automake 1.12 or later
|
||||||
|
* Build fixes for Windows [#76594 #74149]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon May 19 07:04:38 UTC 2014 - lnussel@suse.de
|
Mon May 19 07:04:38 UTC 2014 - lnussel@suse.de
|
||||||
|
|
||||||
|
113
p11-kit.keyring
Normal file
113
p11-kit.keyring
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
Version: GnuPG v2
|
||||||
|
|
||||||
|
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
|
||||||
|
=sjbp
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
10
p11-kit.spec
10
p11-kit.spec
@ -22,7 +22,7 @@
|
|||||||
%define trustdir_static %{pkidir_static}/trust
|
%define trustdir_static %{pkidir_static}/trust
|
||||||
|
|
||||||
Name: p11-kit
|
Name: p11-kit
|
||||||
Version: 0.20.2
|
Version: 0.20.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Library to work with PKCS#11 modules
|
Summary: Library to work with PKCS#11 modules
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
@ -34,6 +34,12 @@ Source99: baselibs.conf
|
|||||||
# patch proposed upstream. If it gets rejected, need to implement
|
# patch proposed upstream. If it gets rejected, need to implement
|
||||||
# this in ca-certificates.
|
# this in ca-certificates.
|
||||||
Patch0: 0001-trust-allow-to-also-add-openssl-style-hashes-to-pem-d.diff
|
Patch0: 0001-trust-allow-to-also-add-openssl-style-hashes-to-pem-d.diff
|
||||||
|
# PATCH-FIX-OPENSUSE
|
||||||
|
# trust-Print-label-of-certificate-when-complaining-.patch bnc#890908 lnussel@suse.de
|
||||||
|
Patch1: trust-Print-label-of-certificate-when-complaining-.patch
|
||||||
|
# PATCH-FIX-OPENSUSE
|
||||||
|
# trust-Dont-use-invalid-public-keys-for-looking-up-.patch bnc#890908 lnussel@suse.de
|
||||||
|
Patch2: trust-Dont-use-invalid-public-keys-for-looking-up-.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -93,6 +99,8 @@ to be installed intead of mozilla-nss-certs.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# just because of patch0
|
# just because of patch0
|
||||||
|
26
trust-Dont-use-invalid-public-keys-for-looking-up-.patch
Normal file
26
trust-Dont-use-invalid-public-keys-for-looking-up-.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 244e885d3e9aae7f7b286f1115a220eb16fa0530 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stef Walter <stefw@redhat.com>
|
||||||
|
Date: Fri, 8 Aug 2014 08:47:54 +0200
|
||||||
|
Subject: [PATCH] trust: Don't use invalid public keys for looking up stapled
|
||||||
|
extensions
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=82328
|
||||||
|
---
|
||||||
|
trust/builder.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/trust/builder.c b/trust/builder.c
|
||||||
|
index f7ea86a..fd7a662 100644
|
||||||
|
--- a/trust/builder.c
|
||||||
|
+++ b/trust/builder.c
|
||||||
|
@@ -125,7 +125,7 @@ lookup_extension (p11_builder *builder,
|
||||||
|
{ CKA_INVALID },
|
||||||
|
};
|
||||||
|
|
||||||
|
- if (public_key == NULL)
|
||||||
|
+ if (public_key == NULL || public_key->type == CKA_INVALID)
|
||||||
|
public_key = p11_attrs_find_valid (cert, CKA_X_PUBLIC_KEY_INFO);
|
||||||
|
|
||||||
|
/* Look for a stapled certificate extension */
|
||||||
|
--
|
||||||
|
1.9.3
|
37
trust-Print-label-of-certificate-when-complaining-.patch
Normal file
37
trust-Print-label-of-certificate-when-complaining-.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 70228770eb96e7121e12632a85e603727ed42431 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stef Walter <stefw@redhat.com>
|
||||||
|
Date: Fri, 8 Aug 2014 08:47:23 +0200
|
||||||
|
Subject: [PATCH] trust: Print label of certificate when complaining about
|
||||||
|
basic constraints
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=82328
|
||||||
|
---
|
||||||
|
trust/builder.c | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/trust/builder.c b/trust/builder.c
|
||||||
|
index 18c09ad..f7ea86a 100644
|
||||||
|
--- a/trust/builder.c
|
||||||
|
+++ b/trust/builder.c
|
||||||
|
@@ -551,6 +551,7 @@ calc_certificate_category (p11_builder *builder,
|
||||||
|
CK_ATTRIBUTE *public_key,
|
||||||
|
CK_ULONG *category)
|
||||||
|
{
|
||||||
|
+ CK_ATTRIBUTE *label;
|
||||||
|
unsigned char *ext;
|
||||||
|
size_t ext_len;
|
||||||
|
bool is_ca = 0;
|
||||||
|
@@ -570,7 +571,10 @@ calc_certificate_category (p11_builder *builder,
|
||||||
|
ret = p11_x509_parse_basic_constraints (builder->asn1_defs, ext, ext_len, &is_ca);
|
||||||
|
free (ext);
|
||||||
|
if (!ret) {
|
||||||
|
- p11_message ("invalid basic constraints certificate extension");
|
||||||
|
+ label = p11_attrs_find_valid (cert, CKA_LABEL);
|
||||||
|
+ p11_message ("%.*s: invalid basic constraints certificate extension",
|
||||||
|
+ label ? (int)label->ulValueLen : 7,
|
||||||
|
+ label ? (char *)label->pValue : "unknown");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.3
|
Loading…
Reference in New Issue
Block a user