diff options
| author | Kim Alvefur <zash@zash.se> | 2019-04-24 18:06:48 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-04-24 18:06:48 +0200 |
| commit | aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03 (patch) | |
| tree | 6428934ad658fb37297399185cbd51ea8adce98d | |
| parent | 196ac28ab5b002063f2b25dc60bd809c707b8ab2 (diff) | |
| parent | c42a786ec79fcfe936a3dccde9d0cdf70d6255b0 (diff) | |
| download | prosody-aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03.tar.gz prosody-aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03.zip | |
Merge 0.11->trunk
| -rw-r--r-- | core/portmanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_tls.lua | 3 | ||||
| -rw-r--r-- | util-src/encodings.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index 5aef07d7..9eb40abf 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -113,6 +113,7 @@ local function activate(service_name) if service_info.encryption == "ssl" then local global_ssl_config = config.get("*", "ssl") or {}; local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config; + log("debug", "Creating context for direct TLS service %s on port %d", service_info.name, port); ssl, err, cfg = certmanager.create_context(service_info.name.." port "..port, "server", prefix_ssl_config[interface], prefix_ssl_config[port], @@ -254,7 +255,6 @@ local function add_sni_host(host, service) end end end - prosody.events.add_handler("item-added/net-provider", function (event) local item = event.item; register_service(item.name, item); diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index d8bf02c4..b16acd09 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -53,11 +53,14 @@ function module.load() local parent_s2s = rawgetopt(parent, "s2s_ssl") or NULL; local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_s2s; + module:log("debug", "Creating context for c2s"); local request_client_certs = { verify = { "peer", "client_once", }; }; + module:log("debug", "Creating context for s2sout"); ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err_c2s); end + module:log("debug", "Creating context for s2sin"); -- for outgoing server connections ssl_ctx_s2sout, err_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s, request_client_certs); if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err_s2sout); end diff --git a/util-src/encodings.c b/util-src/encodings.c index f7e8131f..e55a3f44 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -299,7 +299,7 @@ static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile) return 1; } - prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, 0, NULL, &err); + prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, USPREP_ALLOW_UNASSIGNED, NULL, &err); if(U_FAILURE(err)) { lua_pushnil(L); |