diff options
| author | Kim Alvefur <zash@zash.se> | 2023-07-10 00:34:37 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2023-07-10 00:34:37 +0200 |
| commit | 2b56e0473a565bc286376784e3f70c1688fad1cf (patch) | |
| tree | 91308fde4edb183dae1bbbda5f44d51ec1e42141 | |
| parent | 4e6ccdad9644b346172681e42c9a211f32e1ec35 (diff) | |
| parent | 59f9a608fda54f281658b35688c336f6a22046de (diff) | |
| download | prosody-2b56e0473a565bc286376784e3f70c1688fad1cf.tar.gz prosody-2b56e0473a565bc286376784e3f70c1688fad1cf.zip | |
Merge 0.12->trunk
| -rw-r--r-- | core/certmanager.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_pubsub/pubsub.lib.lua | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 5775018d..b04f7da0 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -215,7 +215,7 @@ local core_defaults = { local mozilla_ssl_configs = { -- https://wiki.mozilla.org/Security/Server_Side_TLS - -- Version 5.6 as of 2021-12-26 + -- Version 5.7 as of 2023-07-09 modern = { protocol = "tlsv1_3"; options = { cipher_server_preference = false }; @@ -236,6 +236,7 @@ local mozilla_ssl_configs = { "ECDHE-RSA-CHACHA20-POLY1305"; "DHE-RSA-AES128-GCM-SHA256"; "DHE-RSA-AES256-GCM-SHA384"; + "DHE-RSA-CHACHA20-POLY1305"; }; curveslist = { "X25519"; "prime256v1"; "secp384r1" }; ciphersuites = { "TLS_AES_128_GCM_SHA256"; "TLS_AES_256_GCM_SHA384"; "TLS_CHACHA20_POLY1305_SHA256" }; diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua index c8b2469b..28b7be50 100644 --- a/plugins/mod_pubsub/pubsub.lib.lua +++ b/plugins/mod_pubsub/pubsub.lib.lua @@ -320,7 +320,7 @@ function _M.handle_disco_items_node(event, service) end for _, id in ipairs(ret) do - reply:tag("item", { jid = service.jid or module.host, name = id }):up(); + reply:tag("item", { jid = service.config.jid or module.host, name = id }):up(); end event.exists = true; end |