summaryrefslogtreecommitdiff
path: root/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch
diff options
context:
space:
mode:
authorKiyoshi Aman <kiyoshi.aman+adelie@gmail.com>2019-04-16 13:24:09 -0500
committerKiyoshi Aman <kiyoshi.aman+adelie@gmail.com>2019-04-16 13:24:09 -0500
commit1677f0f3f9c661b36042c4568ff7f3048f1dafeb (patch)
tree2ace48ca7548c8342199ed8919762b07b3423f90 /user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch
parent26d49f8ffba242aefb5f26aa1e0d07911cda20e6 (diff)
downloadpackages-1677f0f3f9c661b36042c4568ff7f3048f1dafeb.tar.gz
packages-1677f0f3f9c661b36042c4568ff7f3048f1dafeb.tar.bz2
packages-1677f0f3f9c661b36042c4568ff7f3048f1dafeb.tar.xz
packages-1677f0f3f9c661b36042c4568ff7f3048f1dafeb.zip
user/glib-networking: upgrade to 2.60.1, add patch for gnutls-3.6.7+
Diffstat (limited to 'user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch')
-rw-r--r--user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch
new file mode 100644
index 000000000..ab04dae3e
--- /dev/null
+++ b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch
@@ -0,0 +1,31 @@
+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"));