Software / code / prosody
Comparison
plugins/mod_tls.lua @ 9975:ca01c449357f
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Apr 2019 18:06:48 +0200 |
| parent | 9854:115b5e32d960 |
| parent | 9971:5b048ccd106f |
| child | 10784:0b0fe73199d2 |
comparison
equal
deleted
inserted
replaced
| 9974:c30933aa0242 | 9975:ca01c449357f |
|---|---|
| 51 | 51 |
| 52 local global_s2s = rawgetopt("*", "s2s_ssl") or NULL; | 52 local global_s2s = rawgetopt("*", "s2s_ssl") or NULL; |
| 53 local parent_s2s = rawgetopt(parent, "s2s_ssl") or NULL; | 53 local parent_s2s = rawgetopt(parent, "s2s_ssl") or NULL; |
| 54 local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_s2s; | 54 local host_s2s = rawgetopt(modhost, "s2s_ssl") or parent_s2s; |
| 55 | 55 |
| 56 module:log("debug", "Creating context for c2s"); | |
| 56 local request_client_certs = { verify = { "peer", "client_once", }; }; | 57 local request_client_certs = { verify = { "peer", "client_once", }; }; |
| 57 | 58 |
| 59 module:log("debug", "Creating context for s2sout"); | |
| 58 ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections | 60 ssl_ctx_c2s, err_c2s, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections |
| 59 if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err_c2s); end | 61 if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err_c2s); end |
| 60 | 62 |
| 63 module:log("debug", "Creating context for s2sin"); | |
| 61 -- for outgoing server connections | 64 -- for outgoing server connections |
| 62 ssl_ctx_s2sout, err_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s, request_client_certs); | 65 ssl_ctx_s2sout, err_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s, request_client_certs); |
| 63 if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err_s2sout); end | 66 if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err_s2sout); end |
| 64 | 67 |
| 65 -- for incoming server connections | 68 -- for incoming server connections |