Mercurial > prosody-hg
comparison core/certmanager.lua @ 5908:081a91507e4f
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 10 Nov 2013 18:49:34 +0000 |
| parents | c1bc2c20a80a 9586979058b8 |
| children | 1c4405f33561 |
comparison
equal
deleted
inserted
replaced
| 5904:c1bc2c20a80a | 5908:081a91507e4f |
|---|---|
| 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", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil }; | 40 options = { "no_sslv2", "no_sslv3", "cipher_server_preference", 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+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL"; |
| 44 } | 44 } |
| 45 local path_options = { -- These we pass through resolve_path() | 45 local path_options = { -- These we pass through resolve_path() |
| 46 key = true, certificate = true, cafile = true, capath = true, dhparam = true | 46 key = true, certificate = true, cafile = true, capath = true, dhparam = true |
| 47 } | 47 } |
| 48 | 48 |
