diff options
| author | Kim Alvefur <zash@zash.se> | 2023-10-27 22:38:00 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2023-10-27 22:38:00 +0200 |
| commit | 7a9e8092ac4f3d600889f5ce1e4a592dc6353d42 (patch) | |
| tree | 615abd23e861df76c51781030a99748b0b583081 | |
| parent | c7cf6a8dc32680a207a3b616756a4f21ec4d4709 (diff) | |
| parent | e8128c1d608cb18b1d1e913395fb9b897dd4525e (diff) | |
| download | prosody-7a9e8092ac4f3d600889f5ce1e4a592dc6353d42.tar.gz prosody-7a9e8092ac4f3d600889f5ce1e4a592dc6353d42.zip | |
Merge 0.12->trunk
| -rw-r--r-- | core/certmanager.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index b04f7da0..a4acb0a0 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -307,8 +307,11 @@ local function create_context(host, mode, ...) password = function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end; }); local profile = configmanager.get("*", "tls_profile") or "intermediate"; - if profile ~= "legacy" then + if mozilla_ssl_configs[profile] then cfg:apply(mozilla_ssl_configs[profile]); + elseif profile ~= "legacy" then + log("error", "Invalid value for 'tls_profile': expected one of \"modern\", \"intermediate\" (default), \"old\" or \"legacy\" but got %q", profile); + return nil, "Invalid configuration, 'tls_profile' had an unknown value."; end cfg:apply(global_ssl_config); |