Comparison

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
comparison
equal deleted inserted replaced
5669:9345c161481f 5674:ebdbf4cf0b2f
62 cafile = resolve_path(config_path, user_ssl_config.cafile); 62 cafile = resolve_path(config_path, user_ssl_config.cafile);
63 verify = user_ssl_config.verify or default_verify; 63 verify = user_ssl_config.verify or default_verify;
64 verifyext = user_ssl_config.verifyext or default_verifyext; 64 verifyext = user_ssl_config.verifyext or default_verifyext;
65 options = user_ssl_config.options or default_options; 65 options = user_ssl_config.options or default_options;
66 depth = user_ssl_config.depth; 66 depth = user_ssl_config.depth;
67 curve = user_ssl_config.curve;
68 dhparam = user_ssl_config.dhparam;
67 }; 69 };
68 70
69 local ctx, err = ssl_newcontext(ssl_config); 71 local ctx, err = ssl_newcontext(ssl_config);
70 72
71 -- LuaSec ignores the cipher list from the config, so we have to take care 73 -- LuaSec ignores the cipher list from the config, so we have to take care