Mercurial > prosody-hg

comparison core/certmanager.lua @ 5677:9afc94c4346e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 13 Jun 2013 00:09:56 +0100
parents ebdbf4cf0b2f c1021a2e7071
children 51f7de1b6bb5
comparison
equal deleted inserted replaced
5674:ebdbf4cf0b2f 5677:9afc94c4346e
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; 67 curve = user_ssl_config.curve or "secp384r1";
68 dhparam = user_ssl_config.dhparam; 68 dhparam = user_ssl_config.dhparam;
69 }; 69 };
70 70
71 local ctx, err = ssl_newcontext(ssl_config); 71 local ctx, err = ssl_newcontext(ssl_config);
72 72