parent
95829c838b
commit
f102eb9087
1
.gitignore
vendored
1
.gitignore
vendored
@ -59,3 +59,4 @@
|
|||||||
/glib-networking-2.47.1.tar.xz
|
/glib-networking-2.47.1.tar.xz
|
||||||
/glib-networking-2.47.90.tar.xz
|
/glib-networking-2.47.90.tar.xz
|
||||||
/glib-networking-2.48.0.tar.xz
|
/glib-networking-2.48.0.tar.xz
|
||||||
|
/glib-networking-2.48.1.tar.xz
|
||||||
|
@ -0,0 +1,31 @@
|
|||||||
|
From 7db4dbf03b21e382622d452afda5e28db31d0185 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Carlos Garcia Campos <cgarcia@igalia.com>
|
||||||
|
Date: Thu, 21 Apr 2016 12:28:05 +0200
|
||||||
|
Subject: [PATCH] gnutls: Prevent cycles when building the certificate chain
|
||||||
|
|
||||||
|
Explicitly check self-signed certificates and leave a NULL issuer in that
|
||||||
|
case.
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=765317
|
||||||
|
---
|
||||||
|
tls/gnutls/gtlscertificate-gnutls.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/tls/gnutls/gtlscertificate-gnutls.c b/tls/gnutls/gtlscertificate-gnutls.c
|
||||||
|
index 4ff996c..8dd0544 100644
|
||||||
|
--- a/tls/gnutls/gtlscertificate-gnutls.c
|
||||||
|
+++ b/tls/gnutls/gtlscertificate-gnutls.c
|
||||||
|
@@ -722,6 +722,10 @@ g_tls_certificate_gnutls_build_chain (const gnutls_datum_t *certs,
|
||||||
|
{
|
||||||
|
issuer = NULL;
|
||||||
|
|
||||||
|
+ /* Check if the cert issued itself */
|
||||||
|
+ if (gnutls_x509_crt_check_issuer (gnutls_certs[i], gnutls_certs[i]))
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
if (i < num_certs - 1 &&
|
||||||
|
gnutls_x509_crt_check_issuer (gnutls_certs[i], gnutls_certs[i + 1]))
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.5.5
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
%define glib2_version 2.46.0
|
%define glib2_version 2.46.0
|
||||||
|
|
||||||
Name: glib-networking
|
Name: glib-networking
|
||||||
Version: 2.48.0
|
Version: 2.48.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Networking support for GLib
|
Summary: Networking support for GLib
|
||||||
|
|
||||||
@ -10,6 +10,8 @@ License: LGPLv2+
|
|||||||
URL: http://www.gnome.org
|
URL: http://www.gnome.org
|
||||||
Source: http://download.gnome.org/sources/glib-networking/2.48/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/glib-networking/2.48/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch0: 0001-gnutls-Prevent-cycles-when-building-the-certificate-.patch
|
||||||
|
|
||||||
BuildRequires: glib2-devel >= %{glib2_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
BuildRequires: libproxy-devel
|
BuildRequires: libproxy-devel
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: gnutls-devel
|
||||||
@ -39,7 +41,7 @@ the functionality of the installed glib-networking package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static --with-libproxy --enable-installed-tests
|
%configure --disable-static --with-libproxy --enable-installed-tests
|
||||||
@ -75,6 +77,10 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
|
|||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 28 2016 Michael Catanzaro <mcatanzaro@gnome.org> - 2.48.1-1
|
||||||
|
- Update to 2.48.1
|
||||||
|
- Add patch for GNOME #765317
|
||||||
|
|
||||||
* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 2.48.0-1
|
* Tue Mar 22 2016 Kalev Lember <klember@redhat.com> - 2.48.0-1
|
||||||
- Update to 2.48.0
|
- Update to 2.48.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user