pool/glib-networking
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 691860 from home:vitezslav_cizek:branches:GNOME:Factory

Browse Source 
- Handle new GnuTLS error GNUTLS_E_CERTIFICATE_REQUIRED
  + https://gitlab.gnome.org/GNOME/glib-networking/issues/70
  + add 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch

OBS-URL: https://build.opensuse.org/request/show/691860
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib-networking?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger 2019-04-08 07:04:48 +00:00 committed by Git OBS Bridge
parent 7a0e6eb4a9
commit 8e6f83309a
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch Normal file
View File

@ -0,0 +1,34 @@
From 1ce6b40da8ecbf997c5522a592a122e805aa81c4 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Wed, 3 Apr 2019 18:00:55 -0500
Subject: [PATCH] gnutls: Handle new GNUTLS_E_CERTIFICATE_REQUIRED
This new error in GnuTLS 3.6.7 should correspond to
G_TLS_ERROR_CERTIFICATE_REQUIRED. This fixes our client auth tests when
run with GnuTLS 3.6.7.
Fixes #70
---
tls/gnutls/gtlsconnection-gnutls.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 27bbbcd..774d668 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -1062,7 +1062,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls,
else
return 0;
}
- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
+ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND
+#ifdef GNUTLS_E_CERTIFICATE_REQUIRED
+ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */
+#endif
+ )
{
g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED,
_("TLS connection peer did not send a certificate"));
--
2.21.0

7
glib-networking.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Apr 5 14:47:33 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
- Handle new GnuTLS error GNUTLS_E_CERTIFICATE_REQUIRED
+ https://gitlab.gnome.org/GNOME/glib-networking/issues/70
+ add 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch
-------------------------------------------------------------------
Tue Apr 2 05:52:06 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

2
glib-networking.spec
View File

@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++
URL: https://www.gnome.org
Source0: https://download.gnome.org/sources/glib-networking/2.60/%{name}-%{version}.tar.xz
Source99: baselibs.conf
Patch: 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch
BuildRequires: ca-certificates-mozilla
# For directory ownership
@ -56,6 +57,7 @@ Currently, there is only a proxy module based on libproxy.
%prep
%setup -q
%patch -p1
translation-update-upstream
%build