diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-06-11 21:50:41 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-06-11 21:50:41 +0100 |
| commit | cd86257eabfdc059157650558900a616308a8a24 (patch) | |
| tree | 6c38b9cffb6e0003ab23e2b8e2f133d543d10fbd /core | |
| parent | 707befd0eaee86e6d80d7b0b539abf78f2fd23a5 (diff) | |
| parent | b4884d7aabd7a4a13cb02bea60c49ea2208a084b (diff) | |
| download | prosody-cd86257eabfdc059157650558900a616308a8a24.tar.gz prosody-cd86257eabfdc059157650558900a616308a8a24.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 5be328f6..4b96e774 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -64,6 +64,8 @@ function create_context(host, mode, user_ssl_config) verifyext = user_ssl_config.verifyext or default_verifyext; options = user_ssl_config.options or default_options; depth = user_ssl_config.depth; + curve = user_ssl_config.curve; + dhparam = user_ssl_config.dhparam; }; local ctx, err = ssl_newcontext(ssl_config); |