diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:07:18 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-06-13 19:07:18 +0000 |
commit | 761f867c975b162f71cce3d006af27e7f85e52b3 (patch) | |
tree | 7efafdec24e4b4a712ef584063996fa464f9d03d /user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch | |
parent | a33b497e1219640b47a16bae7de95ea4cd9b4928 (diff) | |
parent | 5701fae654dcb6711ec4ed60653639df32780824 (diff) | |
download | packages-761f867c975b162f71cce3d006af27e7f85e52b3.tar.gz packages-761f867c975b162f71cce3d006af27e7f85e52b3.tar.bz2 packages-761f867c975b162f71cce3d006af27e7f85e52b3.tar.xz packages-761f867c975b162f71cce3d006af27e7f85e52b3.zip |
Merge branch 'bump.aerdan.20190604' into 'master'
Package bumps for 4 June 2019.
See merge request !238
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.patch | 31 |
1 files changed, 0 insertions, 31 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 deleted file mode 100644 index ab04dae3e..000000000 --- a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -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")); |