mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 13:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-07-10 00:34:37 +02:00
commit 2b56e0473a
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/certmanager.lua
View file

@ -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" };

2
plugins/mod_pubsub/pubsub.lib.lua
View file

@ -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