Diff

core/certmanager.lua @ 5674:ebdbf4cf0b2f

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 11 Jun 2013 21:50:41 +0100
parent 5656:576488cffc3a
parent 5673:9ca4d1ada906
child 5677:9afc94c4346e
line wrap: on
line diff
--- a/core/certmanager.lua	Tue Jun 11 21:36:15 2013 +0200
+++ b/core/certmanager.lua	Tue Jun 11 21:50:41 2013 +0100
@@ -64,6 +64,8 @@
 		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);