diff options
| author | Kim Alvefur <zash@zash.se> | 2019-08-25 20:22:35 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-08-25 20:22:35 +0200 |
| commit | c9cf442b304068c59698b776c83a9b619ee0e190 (patch) | |
| tree | 8d3f64e03dc88b1d4127ed767ebf6ab67089253f | |
| parent | f00f039f4bd3e856333ac6db7cadfe33fe20d139 (diff) | |
| download | prosody-c9cf442b304068c59698b776c83a9b619ee0e190.tar.gz prosody-c9cf442b304068c59698b776c83a9b619ee0e190.zip | |
core.certmanager: Move EECDH ciphers before EDH in default cipherstring (fixes #1513)
Backport of 94e341dee51c
The original intent of having kEDH before kEECDH was that if a `dhparam`
file was specified, this would be interpreted as a preference by the
admin for old and well-tested Diffie-Hellman key agreement over newer
elliptic curve ones. Otherwise the faster elliptic curve ciphersuites
would be preferred. This didn't really work as intended since this
affects the ClientHello on outgoing s2s connections, leading to some
servers using poorly configured kEDH.
With Debian shipping OpenSSL settings that enforce a higher security
level, this caused interoperability problems with servers that use DH
params smaller than 2048 bits. E.g. jabber.org at the time of this
writing has 1024 bit DH params.
MattJ says
> Curves have won, and OpenSSL is less weird about them now
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 40021db6..20b91318 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -125,8 +125,8 @@ local core_defaults = { "P-521", }; ciphers = { -- Enabled ciphers in order of preference: - "HIGH+kEDH", -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set "HIGH+kEECDH", -- Ephemeral Elliptic curve Diffie-Hellman key exchange + "HIGH+kEDH", -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set "HIGH", -- Other "High strength" ciphers -- Disabled cipher suites: "!PSK", -- Pre-Shared Key - not used for XMPP |