prosody
019130907a07
core/certmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/certmanager.lua @ 5896:019130907a07

Merge 0.9 -> 0.10
author Kim Alvefur <zash@zash.se>
date Thu, 31 Oct 2013 20:47:57 +0100
parent 5874:3321a4b3e6c4
parent 5895:1b0ac7950129
child 5904:c1bc2c20a80a
comparison
equal deleted inserted replaced
5894:9e47ece9457c 5896:019130907a07
35 35
36 local core_defaults = { 36 local core_defaults = {
37 capath = "/etc/ssl/certs"; 37 capath = "/etc/ssl/certs";
38 protocol = "sslv23"; 38 protocol = "sslv23";
39 verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none"; 39 verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
40 options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil }; 40 options = { "no_sslv2", "no_sslv3", luasec_has_noticket and "no_ticket" or nil };
41 verifyext = { "lsec_continue", "lsec_ignore_purpose" }; 41 verifyext = { "lsec_continue", "lsec_ignore_purpose" };
42 curve = "secp384r1"; 42 curve = "secp384r1";
43 ciphers = "HIGH:!DSS:!aNULL@STRENGTH"; 43 ciphers = "HIGH:!DSS:!aNULL@STRENGTH";
44 } 44 }
45 local path_options = { -- These we pass through resolve_path() 45 local path_options = { -- These we pass through resolve_path()