Software / code / prosody
Comparison
core/certmanager.lua @ 4656:43469a2d124d
core.certmanager: Log a message when a password is required but not supplied. fixes #214
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Apr 2012 23:11:59 +0200 |
| parent | 4408:21881619a394 |
| child | 4855:a31ea431d906 |
comparison
equal
deleted
inserted
replaced
| 4649:e07ce18c503e | 4656:43469a2d124d |
|---|---|
| 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; |