Software / code / prosody
Changeset
13179:1b1ed555f307
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 10 Jul 2023 00:34:37 +0200 |
| parents | 13176:0d1cd3185299 (current diff) 13178:e689d4c45681 (diff) |
| children | 13180:48622b89f570 |
| files | core/certmanager.lua plugins/mod_pubsub/pubsub.lib.lua |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Sun Jul 02 14:31:00 2023 +0200 +++ b/core/certmanager.lua Mon Jul 10 00:34:37 2023 +0200 @@ -215,7 +215,7 @@ 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 @@ "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" };
--- a/plugins/mod_pubsub/pubsub.lib.lua Sun Jul 02 14:31:00 2023 +0200 +++ b/plugins/mod_pubsub/pubsub.lib.lua Mon Jul 10 00:34:37 2023 +0200 @@ -320,7 +320,7 @@ 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
