Mercurial > prosody-hg

comparison core/certmanager.lua @ 4797:e239668aa6d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 29 Apr 2012 02:10:55 +0100
parents 43469a2d124d
children a31ea431d906
comparison
equal deleted inserted replaced
4796:04a34287dc12 4797:e239668aa6d2
33 33
34 local ssl_config = { 34 local ssl_config = {
35 mode = mode; 35 mode = mode;
36 protocol = user_ssl_config.protocol or "sslv23"; 36 protocol = user_ssl_config.protocol or "sslv23";
37 key = resolve_path(config_path, user_ssl_config.key); 37 key = resolve_path(config_path, user_ssl_config.key);
38 password = user_ssl_config.password; 38 password = user_ssl_config.password or function() log("error", "Encrypted certificate for %s requires 'ssl' 'password' to be set in config", host); end;
39 certificate = resolve_path(config_path, user_ssl_config.certificate); 39 certificate = resolve_path(config_path, user_ssl_config.certificate);
40 capath = resolve_path(config_path, user_ssl_config.capath or default_capath); 40 capath = resolve_path(config_path, user_ssl_config.capath or default_capath);
41 cafile = resolve_path(config_path, user_ssl_config.cafile); 41 cafile = resolve_path(config_path, user_ssl_config.cafile);
42 verify = user_ssl_config.verify or default_verify; 42 verify = user_ssl_config.verify or default_verify;
43 options = user_ssl_config.options or default_options; 43 options = user_ssl_config.options or default_options;