summaryrefslogtreecommitdiff
path: root/src/gnutls.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-09-05 11:42:56 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-09-05 11:43:15 -0700
commitb9e37f551add188f82f2583d3eb13cb81e707387 (patch)
tree97c8fae9c43f861cb6fab442d90845e55a3d9787 /src/gnutls.c
parent2180852c72a3edb5b03074fb293fb995a9b9485d (diff)
downloademacs-b9e37f551add188f82f2583d3eb13cb81e707387.tar.gz
Port :safe-renegotiation test to GnuTLS < 3.6.3
Problem reported by Robert Pluim in https://lists.gnu.org/r/emacs-devel/2019-09/msg00127.html * src/gnutls.c (Fgnutls_peer_status): Simplify test for whether the :safe-renegotiation result is needed, so that it works all the way back to GnuTLS 2.12.2.
Diffstat (limited to 'src/gnutls.c')
-rw-r--r--src/gnutls.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index c74936c840f..d43534b5ae1 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1520,12 +1520,7 @@ returned as the :certificate entry. */)
#endif
/* Renegotiation Indication */
-#ifdef GNUTLS_TLS1_3
- bool older_proto = proto < GNUTLS_TLS1_3;
-#else
- bool older_proto = true;
-#endif
- if (older_proto)
+ if (proto <= GNUTLS_TLS1_2)
result = nconc2
(result, list2 (intern (":safe-renegotiation"),
gnutls_safe_renegotiation_status (state) ? Qt : Qnil));