Merge 0.9->trunk

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 5be328f68880e0c30d896d884169bcea1177661e..4b96e774a8d3cec6ec276498c3f4e6b47b9b26c7 100644 (file)
--- 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);