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 | 6008554b60d04336b81601196c08a90875bdf088 (patch) | |
tree | 6c38b9cffb6e0003ab23e2b8e2f133d543d10fbd | |
parent | 4c9866805e69426b720586141c73d94fc4a54cd5 (diff) | |
parent | 040187b661db063f291ee117982a5858389179d0 (diff) | |
download | prosody-6008554b60d04336b81601196c08a90875bdf088.tar.gz prosody-6008554b60d04336b81601196c08a90875bdf088.zip |
Merge 0.9->trunk
-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); |