[Emacs-diffs] master b9e37f5: Port :safe-renegotiation test to GnuTLS < 3.6.3

[Paul Eggert]

branch: master
commit b9e37f551add188f82f2583d3eb13cb81e707387
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/gnutls.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gnutls.c b/src/gnutls.c
index c74936c..d43534b 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));