Fix issue with rehandshake affecting glib-networking (#1634736)

This commit is contained in:
Nikos Mavrogiannopoulos 2018-10-17 14:58:03 +02:00
parent 9d0f5cc6e3
commit ba25b06f42
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff --git a/lib/priority.c b/lib/priority.c
index 53c0d55..e727fcf 100644
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -592,7 +592,9 @@ gnutls_priority_set(gnutls_session_t session, gnutls_priority_t priority)
/* set the current version to the first in the chain.
* This will be overridden later.
*/
- if (session->internals.priorities->protocol.algorithms > 0) {
+ if (session->internals.priorities->protocol.algorithms > 0 &&
+ !session->internals.handshake_in_progress &&
+ !session->internals.initial_negotiation_completed) {
if (_gnutls_set_current_version(session,
session->internals.priorities->
protocol.priority[0]) < 0) {

View File

@ -1,8 +1,9 @@
# This spec file has been automatically updated
Version: 3.6.4
Release: 3%{?dist}
Release: 4%{?dist}
Patch1: gnutls-3.2.7-rpath.patch
Patch2: gnutls-3.6.4-no-now-guile.patch
Patch3: gnutls-3.6.4-fix-rehandshake.patch
%bcond_without dane
%if 0%{?rhel}
%bcond_with guile
@ -304,6 +305,9 @@ fi
%endif
%changelog
* Wed Oct 17 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.6.4-4
- Fix issue with rehandshake affecting glib-networking (#1634736)
* Tue Oct 16 2018 Tomáš Mráz <tmraz@redhat.com> - 3.6.4-3
- Add missing annobin notes for assembler sources