diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-03 01:00:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-03 01:01:30 -0700 |
| commit | f465efe412607c6b931e3592e96200f2ff3b8d74 (patch) | |
| tree | 66853a70ad4df9b3a08ae6e272fd590e6009b926 /src/gnutls.h | |
| parent | a8a81df8da1adad2d4feb22b1fd6aac0f7ca98d2 (diff) | |
| download | emacs-f465efe412607c6b931e3592e96200f2ff3b8d74.tar.gz | |
Port GnuTLS usage to Ubuntu 16.04.2 LTS
* src/gnutls.h (HAVE_GNUTLS3_AEAD): Define only if GnuTLS 3.5.1 or
later, as opposed to the old 3.4.0 or later.
Diffstat (limited to 'src/gnutls.h')
| -rw-r--r-- | src/gnutls.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gnutls.h b/src/gnutls.h index 19c16867d7a..8fe4ac3e427 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -29,12 +29,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif #if 0x030400 <= GNUTLS_VERSION_NUMBER -# define HAVE_GNUTLS3_AEAD # define HAVE_GNUTLS3_CIPHER # define HAVE_GNUTLS3_DIGEST # define HAVE_GNUTLS3_HMAC #endif +/* Although AEAD support started in GnuTLS 3.4.0 and works in 3.5.14, + it was broken through at least GnuTLS 3.4.10; see: + https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg00992.html + The relevant fix seems to have been made in GnuTLS 3.5.1; see: + https://gitlab.com/gnutls/gnutls/commit/568935848dd6b82b9315d8b6c529d00e2605e03d + So use 3.5.1 for now. */ +#if 0x030501 <= GNUTLS_VERSION_NUMBER +# define HAVE_GNUTLS3_AEAD +#endif + #include "lisp.h" /* This limits the attempts to handshake per process (connection). It |