diff options
| author | Paul Eggert | 2019-09-05 11:42:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-09-05 11:43:15 -0700 |
| commit | b9e37f551add188f82f2583d3eb13cb81e707387 (patch) | |
| tree | 97c8fae9c43f861cb6fab442d90845e55a3d9787 /src | |
| parent | 2180852c72a3edb5b03074fb293fb995a9b9485d (diff) | |
| download | emacs-b9e37f551add188f82f2583d3eb13cb81e707387.tar.gz emacs-b9e37f551add188f82f2583d3eb13cb81e707387.zip | |
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')
| -rw-r--r-- | src/gnutls.c | 7 |
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. */) | |||
| 1520 | #endif | 1520 | #endif |
| 1521 | 1521 | ||
| 1522 | /* Renegotiation Indication */ | 1522 | /* Renegotiation Indication */ |
| 1523 | #ifdef GNUTLS_TLS1_3 | 1523 | if (proto <= GNUTLS_TLS1_2) |
| 1524 | bool older_proto = proto < GNUTLS_TLS1_3; | ||
| 1525 | #else | ||
| 1526 | bool older_proto = true; | ||
| 1527 | #endif | ||
| 1528 | if (older_proto) | ||
| 1529 | result = nconc2 | 1524 | result = nconc2 |
| 1530 | (result, list2 (intern (":safe-renegotiation"), | 1525 | (result, list2 (intern (":safe-renegotiation"), |
| 1531 | gnutls_safe_renegotiation_status (state) ? Qt : Qnil)); | 1526 | gnutls_safe_renegotiation_status (state) ? Qt : Qnil)); |